diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-06-14 18:01:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 18:01:25 +0200 |
| commit | cf81c53e8b747603ba6599f8c9fbdf50feff4c88 (patch) | |
| tree | 6e5b8a6c6dfc2be5a41674b94b6e2a8d0192009f /playbooks/common | |
| parent | f7d8bd196c4cd7fed7de94a9ab87abd3295b5b06 (diff) | |
| parent | 9e2fcb48c36b9478e34b93ed0025c6b77b7ad597 (diff) | |
| download | openshift-cf81c53e8b747603ba6599f8c9fbdf50feff4c88.tar.gz openshift-cf81c53e8b747603ba6599f8c9fbdf50feff4c88.tar.bz2 openshift-cf81c53e8b747603ba6599f8c9fbdf50feff4c88.tar.xz openshift-cf81c53e8b747603ba6599f8c9fbdf50feff4c88.zip | |
Merge pull request #4443 from ingvagabund/move-etcd-backup-to-etcd-common
move etcd backup to etcd_common role
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/etcd/backup.yml | 12 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/etcd/main.yml | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml index b7fd2c0c5..616ba04f8 100644 --- a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml +++ b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml @@ -3,12 +3,12 @@ hosts: oo_etcd_hosts_to_backup roles: - role: openshift_facts - - role: etcd_upgrade - r_etcd_upgrade_action: backup - r_etcd_backup_tag: etcd_backup_tag + - role: etcd_common + r_etcd_common_action: backup + r_etcd_common_backup_tag: etcd_backup_tag r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" - r_etcd_upgrade_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}" - r_etcd_backup_sufix_name: "{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}" + r_etcd_common_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}" + r_etcd_common_backup_sufix_name: "{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}" - name: Gate on etcd backup hosts: localhost @@ -18,7 +18,7 @@ - set_fact: etcd_backup_completed: "{{ hostvars | oo_select_keys(groups.oo_etcd_hosts_to_backup) - | oo_collect('inventory_hostname', {'r_etcd_upgrade_backup_complete': true}) }}" + | oo_collect('inventory_hostname', {'r_etcd_common_backup_complete': true}) }}" - set_fact: etcd_backup_failed: "{{ groups.oo_etcd_hosts_to_backup | difference(etcd_backup_completed) }}" - fail: diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml index 3e01883ae..64abc54e7 100644 --- a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml +++ b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml @@ -16,7 +16,8 @@ tasks: - include_role: name: etcd_common - tasks_from: etcdctl.yml + vars: + r_etcd_common_action: drop_etcdctl - name: Perform etcd upgrade include: ./upgrade.yml |