1 files changed, 3 insertions, 55 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
index c76b3053d..c5ff4133c 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
@@ -2,60 +2,9 @@
 - name: Determine etcd version
   hosts: oo_etcd_hosts_to_upgrade
   tasks:
-  - block:
-    - name: Record RPM based etcd version
-      command: rpm -qa --qf '%{version}' etcd\*
-      args:
-        warn: no
-      register: etcd_rpm_version
-      failed_when: false
-      # AUDIT:changed_when: `false` because we are only inspecting
-      # state, not manipulating anything
-      changed_when: false
-    - debug:
-        msg: "Etcd rpm version {{ etcd_rpm_version.stdout }} detected"
-    when:
-    - not openshift.common.is_containerized | bool
-
-  - block:
-    - name: Record containerized etcd version (docker)
-      command: docker exec etcd_container rpm -qa --qf '%{version}' etcd\*
-      register: etcd_container_version_docker
-      failed_when: false
-      # AUDIT:changed_when: `false` because we are only inspecting
-      # state, not manipulating anything
-      changed_when: false
-      when:
-      - not openshift.common.is_etcd_system_container | bool
-
-      # Given a register variables is set even if the whwen condition
-      # is false, we need to set etcd_container_version separately
-    - set_fact:
-        etcd_container_version: "{{ etcd_container_version_docker.stdout }}"
-      when:
-      - not openshift.common.is_etcd_system_container | bool
-
-    - name: Record containerized etcd version (runc)
-      command: runc exec etcd rpm -qa --qf '%{version}' etcd\*
-      register: etcd_container_version_runc
-      failed_when: false
-      # AUDIT:changed_when: `false` because we are only inspecting
-      # state, not manipulating anything
-      changed_when: false
-      when:
-      - openshift.common.is_etcd_system_container | bool
-
-      # Given a register variables is set even if the whwen condition
-      # is false, we need to set etcd_container_version separately
-    - set_fact:
-        etcd_container_version: "{{ etcd_container_version_runc.stdout }}"
-      when:
-      - openshift.common.is_etcd_system_container | bool
-
-    - debug:
-        msg: "Etcd containerized version {{ etcd_container_version }} detected"
-    when:
-    - openshift.common.is_containerized | bool
+  - include_role:
+      name: etcd
+      tasks_from: version_detect.yml
 
 - include: upgrade_rpm_members.yml
   vars:
@@ -109,7 +58,6 @@
       name: etcd
       tasks_from: upgrade_image
     vars:
-      r_etcd_common_etcd_runtime: "host"
       etcd_peer: "{{ openshift.common.hostname }}"
     when:
     - ansible_distribution == 'Fedora'