summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-05-04 22:31:35 +0200
committerGitHub <noreply@github.com>2017-05-04 22:31:35 +0200
commitf7993afb2fec58b7bd13a70d812bf60deb5b1402 (patch)
tree00dcdb4bf13e242caa5106739bbbb879118e0190 /playbooks/common/openshift-cluster/upgrades
parent0f85adf01fdb6432b9155e31dbfb17ffb731f161 (diff)
parent1dcf43f235cd6c5125e4f2b60a4301105b7344fe (diff)
downloadopenshift-f7993afb2fec58b7bd13a70d812bf60deb5b1402.tar.gz
openshift-f7993afb2fec58b7bd13a70d812bf60deb5b1402.tar.bz2
openshift-f7993afb2fec58b7bd13a70d812bf60deb5b1402.tar.xz
openshift-f7993afb2fec58b7bd13a70d812bf60deb5b1402.zip
Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-common
move etcdctl.yml from etcd to etcd_common role
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/main.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
index 73657d2f1..d9b59edcb 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
@@ -14,7 +14,9 @@
- name: Drop etcdctl profiles
hosts: oo_etcd_hosts_to_upgrade
tasks:
- - include: roles/etcd/tasks/etcdctl.yml
+ - include_role:
+ name: etcd_common
+ tasks_from: etcdctl.yml
- name: Perform etcd upgrade
include: ./upgrade.yml