Properly detect etcd version in static pod

roles/etcd/defaults/main.yaml

@@ -4,8 +4,10 @@ r_etcd_common_backup_sufix_name: ''
 
 l_is_etcd_system_container: "{{ (openshift_use_etcd_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
 
+l_etcd_static_pod: "{{ not (r_etcd_common_skip_command_shim is defined and r_etcd_common_skip_command_shim) or openshift.node.bootstrapped }}"
+
 # runc, docker, host
-r_etcd_common_etcd_runtime: "{{ 'static_pod' if (not (r_etcd_common_skip_command_shim is defined and r_etcd_common_skip_command_shim) or openshift.node.bootstrapped) else ('runc' if l_is_etcd_system_container else ('docker' if openshift_is_containerized else 'host')) }}"
+r_etcd_common_etcd_runtime: "{{ 'static_pod' if l_etcd_static_pod else ('runc' if l_is_etcd_system_container else ('docker' if openshift_is_containerized else 'host')) }}"
 
 r_etcd_default_version: "3.2.15"
 osm_etcd_image: "registry.access.redhat.com/rhel7/etcd:{{ r_etcd_upgrade_version | default(r_etcd_default_version) }}"

roles/etcd/tasks/version_detect.yml

@@ -23,14 +23,14 @@
     # state, not manipulating anything
     changed_when: false
     when:
-    - not l_is_etcd_system_container | bool
+    - not l_is_etcd_system_container | bool and not l_etcd_static_pod | 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 l_is_etcd_system_container | bool
+    - not l_is_etcd_system_container | bool and not l_etcd_static_pod | bool
 
   - name: Record containerized etcd version (runc)
     command: runc exec etcd rpm -qa --qf '%{version}' etcd\*
@@ -40,14 +40,31 @@
     # state, not manipulating anything
     changed_when: false
     when:
-    - l_is_etcd_system_container | bool
+    - l_is_etcd_system_container | bool and not l_etcd_static_pod | 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:
-    - l_is_etcd_system_container | bool
+    - l_is_etcd_system_container | bool and not l_etcd_static_pod
+
+  - name: Record etcd version (static pod)
+    command: /usr/local/bin/master-exec etcd etcd rpm -qa --qf '%{version}' etcd\*
+    register: etcd_container_version_static_pod
+    failed_when: false
+    # AUDIT:changed_when: `false` because we are only inspecting
+    # state, not manipulating anything
+    changed_when: false
+    when:
+    - l_etcd_static_pod | 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_static_pod.stdout }}"
+    when:
+    - l_etcd_static_pod | bool
 
   - debug:
       msg: "Etcd containerized version {{ etcd_container_version }} detected"