diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-26 21:02:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 21:02:41 -0700 |
| commit | e470434850316b7c12758957aaaf3e917e60ac74 (patch) | |
| tree | 5b8e907c128e504b6ad151ec9a73845989f7f554 /playbooks/common/openshift-cluster/upgrades/etcd | |
| parent | 944e91554d0de4dccbf82cb799a016c320e97245 (diff) | |
| parent | 18306e3401818cfd9723b6813987308f584c6ea3 (diff) | |
| download | openshift-e470434850316b7c12758957aaaf3e917e60ac74.tar.gz openshift-e470434850316b7c12758957aaaf3e917e60ac74.tar.bz2 openshift-e470434850316b7c12758957aaaf3e917e60ac74.tar.xz openshift-e470434850316b7c12758957aaaf3e917e60ac74.zip | |
Merge pull request #5470 from ingvagabund/consolidate-etcd-common-role
Automatic merge from submit-queue
Consolidate etcd common role
The last PR toward a single etcd role
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/etcd')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/etcd/backup.yml | 15 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/etcd/main.yml | 5 |
2 files changed, 11 insertions, 9 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml index a3c9e4eb3..645b8c4e2 100644 --- a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml +++ b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml @@ -3,12 +3,15 @@ hosts: oo_etcd_hosts_to_backup roles: - role: openshift_etcd_facts - - 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_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') }}" + post_tasks: + - include_role: + name: etcd + tasks_from: backup + vars: + r_etcd_common_backup_tag: etcd_backup_tag + r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" + 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 diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml index 64abc54e7..5c8467a4e 100644 --- a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml +++ b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml @@ -15,9 +15,8 @@ hosts: oo_etcd_hosts_to_upgrade tasks: - include_role: - name: etcd_common - vars: - r_etcd_common_action: drop_etcdctl + name: etcd + tasks_from: drop_etcdctl - name: Perform etcd upgrade include: ./upgrade.yml |