Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-common

move etcdctl.yml from etcd to etcd_common role

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

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