Merge pull request #4689 from ingvagabund/drop-etcdctl-before-etcd_co…

…ntainer-service-1.5

[1.5 backport] drop etcdctl before the etcd_container service

roles/etcd/tasks/main.yml

@@ -10,6 +10,9 @@
   package: name=etcd{{ '-' + etcd_version if etcd_version is defined else '' }} state=present
   when: not etcd_is_containerized | bool
 
+- include: etcdctl.yml
+  when: openshift_etcd_etcdctl_profile | default(true) | bool
+
 - name: Pull etcd container
   command: docker pull {{ openshift.etcd.etcd_image }}
   register: pull_result
@@ -132,9 +135,6 @@
     enabled: yes
   register: start_result
 
-- include: etcdctl.yml
-  when: openshift_etcd_etcdctl_profile | default(true) | bool
-
 - name: Set fact etcd_service_status_changed
   set_fact:
     etcd_service_status_changed: "{{ start_result | changed }}"