ES Restore Host Dynamic Changes (#613)

* Variablizing ES host for restore

ansible/es.yml

@@ -12,13 +12,13 @@
   tags:
     - es_backup
 
-- hosts: es-backup
+- hosts: "{{remote}}"
   gather_facts: no
   become: yes
   vars_files:
     - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
   vars:
-    - es_restore_host: "{{app_es_restore_host}}"
+    - es_restore_host: "{{remote}}"
     - snapshot_base_path: "{{app_snapshot_base_path}}"
   roles:
     - es-azure-restore
@@ -39,13 +39,13 @@
   tags:
     - log_es_backup
 
-- hosts: log-es-backup
+- hosts: "{{remote}}"
   gather_facts: no
   become: yes
   vars_files:
     - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
   vars:
-    - es_restore_host: "{{log_es_restore_host}}"
+    - es_restore_host: "{{remote}}"
     - snapshot_base_path: "{{log_snapshot_base_path}}"
   roles:
     - es-azure-restore

pipelines/backup/es-restore/Jenkinsfile

@@ -20,7 +20,7 @@ node() {
                 jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
                 currentWs = sh(returnStdout: true, script: 'pwd').trim()
                 ansiblePlaybook = "${currentWs}/ansible/es.yml"
-                ansibleExtraArgs = "--tags \"es_restore\" --extra-vars \"snapshot_number=${params.snapshot_name}\" -v --vault-password-file /var/lib/jenkins/secrets/vault-pass"
+                ansibleExtraArgs = "--tags \"es_restore\" --extra-vars \"remote=${params.host} snapshot_number=${params.snapshot_name}\" -v --vault-password-file /var/lib/jenkins/secrets/vault-pass"
                 values.put('currentWs', currentWs)
                 values.put('env', envDir)
                 values.put('module', module)

pipelines/backup/logger-es-restore/Jenkinsfile

@@ -20,7 +20,7 @@ node() {
                 jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim()
                 currentWs = sh(returnStdout: true, script: 'pwd').trim()
                 ansiblePlaybook = "${currentWs}/ansible/es.yml"
-                ansibleExtraArgs = " --tags \"log_es_restore\" --extra-vars \"snapshot_number=${params.snapshot_number}\" --vault-password-file /var/lib/jenkins/secrets/vault-pass"
+                ansibleExtraArgs = "--tags \"es_restore\" --extra-vars \"remote=${params.host} snapshot_number=${params.snapshot_name}\" -v --vault-password-file /var/lib/jenkins/secrets/vault-pass"
                 values.put('currentWs', currentWs)
                 values.put('env', envDir)
                 values.put('module', module)