diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-04 22:31:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 22:31:35 +0200 |
| commit | f7993afb2fec58b7bd13a70d812bf60deb5b1402 (patch) | |
| tree | 00dcdb4bf13e242caa5106739bbbb879118e0190 | |
| parent | 0f85adf01fdb6432b9155e31dbfb17ffb731f161 (diff) | |
| parent | 1dcf43f235cd6c5125e4f2b60a4301105b7344fe (diff) | |
| download | openshift-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
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/etcd/main.yml | 4 | ||||
| -rw-r--r-- | roles/etcd/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/etcd_common/tasks/etcdctl.yml (renamed from roles/etcd/tasks/etcdctl.yml) | 0 | ||||
| -rw-r--r-- | roles/etcd_common/templates/etcdctl.sh.j2 (renamed from roles/etcd/templates/etcdctl.sh.j2) | 0 |
4 files changed, 6 insertions, 2 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 diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml index 35117225b..fa2f44609 100644 --- a/roles/etcd/tasks/main.yml +++ b/roles/etcd/tasks/main.yml @@ -120,7 +120,9 @@ enabled: yes register: start_result -- include: etcdctl.yml +- include_role: + name: etcd_common + tasks_from: etcdctl.yml when: openshift_etcd_etcdctl_profile | default(true) | bool - name: Set fact etcd_service_status_changed diff --git a/roles/etcd/tasks/etcdctl.yml b/roles/etcd_common/tasks/etcdctl.yml index 6cb456677..6cb456677 100644 --- a/roles/etcd/tasks/etcdctl.yml +++ b/roles/etcd_common/tasks/etcdctl.yml diff --git a/roles/etcd/templates/etcdctl.sh.j2 b/roles/etcd_common/templates/etcdctl.sh.j2 index ac7d9c72f..ac7d9c72f 100644 --- a/roles/etcd/templates/etcdctl.sh.j2 +++ b/roles/etcd_common/templates/etcdctl.sh.j2 |