From f3c7579103683d297a8571ce8e39832ba9832c5f Mon Sep 17 00:00:00 2001
From: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Date: Thu, 11 Jul 2019 20:15:18 +0530
Subject: [PATCH] ES Restore Host Dynamic Changes (#613)
* Variablizing ES host for restore
---
ansible/es.yml | 8 ++++----
pipelines/backup/es-restore/Jenkinsfile | 2 +-
pipelines/backup/logger-es-restore/Jenkinsfile | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ansible/es.yml b/ansible/es.yml
index 51ba2d459..52b9502a2 100644
--- a/ansible/es.yml
+++ b/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
diff --git a/pipelines/backup/es-restore/Jenkinsfile b/pipelines/backup/es-restore/Jenkinsfile
index e15cc3611..f069b6dd5 100644
--- a/pipelines/backup/es-restore/Jenkinsfile
+++ b/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)
diff --git a/pipelines/backup/logger-es-restore/Jenkinsfile b/pipelines/backup/logger-es-restore/Jenkinsfile
index 31b107fd9..f069b6dd5 100644
--- a/pipelines/backup/logger-es-restore/Jenkinsfile
+++ b/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)
--
GitLab