Merge pull request #6193 from mgugino-upstream-stage/etc-runtime

Cleanup etcd runtime variable.

5 files changed, 3 insertions, 60 deletions

diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml
index 41e19f5d6..d4e922ca9 100644
--- a/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml
+++ b/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml
@@ -41,7 +41,6 @@
       name: etcd
       tasks_from: distribute_ca
     vars:
-      r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}"
       etcd_sync_cert_dir: "{{ hostvars['localhost'].g_etcd_mktemp.stdout }}"
       etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}"
 
@@ -60,7 +59,6 @@
       tasks_from: retrieve_ca_certificates
     vars:
       etcd_sync_cert_dir: "{{ hostvars['localhost'].g_etcd_mktemp.stdout }}"
-      r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}"
 
 - name: Distribute etcd CA to masters
   hosts: oo_masters_to_config
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml
index d086cad00..531175c85 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml
@@ -9,7 +9,6 @@
       tasks_from: backup
     vars:
       r_etcd_common_backup_tag: "{{ etcd_backup_tag }}"
-      r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}"
       r_etcd_common_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
       r_etcd_common_backup_sufix_name: "{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}"
 
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'
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_image_members.yml b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_image_members.yml
index e5e895775..6fca42bd0 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_image_members.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_image_members.yml
@@ -11,7 +11,6 @@
       tasks_from: upgrade_image
     vars:
       r_etcd_upgrade_version: "{{ etcd_upgrade_version }}"
-      r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}"
       etcd_peer: "{{ openshift.common.hostname }}"
     when:
     - etcd_container_version | default('99') | version_compare(etcd_upgrade_version,'<')
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_rpm_members.yml b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_rpm_members.yml
index a2a26bad4..51e8786b3 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_rpm_members.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_rpm_members.yml
@@ -11,7 +11,6 @@
       tasks_from: upgrade_rpm
     vars:
       r_etcd_upgrade_version: "{{ etcd_upgrade_version }}"
-      r_etcd_common_etcd_runtime: "host"
       etcd_peer: "{{ openshift.common.hostname }}"
     when:
     - etcd_rpm_version.stdout | default('99') | version_compare(etcd_upgrade_version, '<')