Remove system container bits from etcd

This patch removes remaining system container logic and
variables and cleans up various rpm related codepaths.

playbooks/openshift-etcd/private/upgrade_image_members.yml

@@ -1,16 +0,0 @@
----
-# INPUT etcd_upgrade_version
-# INPUT etcd_container_version
-- name: Upgrade containerized hosts to {{ etcd_upgrade_version }}
-  hosts: oo_etcd_hosts_to_upgrade
-  serial: 1
-  tasks:
-  - import_role:
-      name: etcd
-      tasks_from: upgrade_image.yml
-    vars:
-      r_etcd_upgrade_version: "{{ etcd_upgrade_version }}"
-      etcd_peer: "{{ openshift.common.hostname }}"
-    when:
-    - etcd_container_version | default('99') is version_compare(etcd_upgrade_version,'<')
-    - openshift_is_atomic | bool

playbooks/openshift-etcd/private/upgrade_main.yml

@@ -32,19 +32,6 @@
   when:
   - true in hostvars | lib_utils_oo_select_keys(groups['oo_etcd_to_config']) | lib_utils_oo_collect('__etcd_cert_lacks_hostname') | default([false])
 
-# For 1.4/3.4 we want to upgrade everyone to etcd-3.0. etcd docs say to
-# upgrade from 2.0.x to 2.1.x to 2.2.x to 2.3.x to 3.0.x. While this is a tedius
-# task for RHEL and CENTOS it's simply not possible in Fedora unless you've
-# mirrored packages on your own because only the GA and latest versions are
-# available in the repos. So for Fedora we'll simply skip this, sorry.
-
-- name: Detect etcd runtime
-  hosts: oo_etcd_hosts_to_upgrade
-  tasks:
-  - import_role:
-      name: etcd
-      tasks_from: runtime.yml
-
 - name: Backup etcd before upgrading anything
   import_playbook: upgrade_backup.yml
   vars:

playbooks/openshift-etcd/private/upgrade_step.yml

@@ -9,20 +9,3 @@
 - import_playbook: upgrade_rpm_members.yml
   vars:
     etcd_upgrade_version: '3.2'
-
-- import_playbook: upgrade_image_members.yml
-  vars:
-    etcd_upgrade_version: '3.2.7'
-
-- name: Upgrade fedora to latest
-  hosts: oo_etcd_hosts_to_upgrade
-  serial: 1
-  tasks:
-  - import_role:
-      name: etcd
-      tasks_from: upgrade_image.yml
-    vars:
-      etcd_peer: "{{ openshift.common.hostname }}"
-    when:
-    - ansible_distribution == 'Fedora'
-    - not openshift_is_containerized | bool

roles/etcd/defaults/main.yaml

@@ -4,12 +4,10 @@ r_etcd_common_backup_sufix_name: ''
 
 l_etcd_bootstrapped: '{{ openshift.node.bootstrapped }}'
 
-# TODO(michaelgugino): Remove these in 3.11
-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 l_etcd_bootstrapped }}"
+l_etcd_static_pod: "{{ (inventory_hostname in groups['oo_masters']) | bool }}"
 
 # runc, docker, static pod, host
-r_etcd_common_etcd_runtime: "{{ 'runc' if l_is_etcd_system_container else ('static_pod' if l_etcd_static_pod else ('docker' if openshift_is_containerized else 'host')) }}"
+r_etcd_common_etcd_runtime: "{{ 'static_pod' if l_etcd_static_pod  else 'host' }}"
 
 r_etcd_default_version: "3.2.22"
 # lib_utils_oo_oreg_image is a custom filter defined in roles/lib_utils/filter_plugins/oo_filters.py
@@ -23,14 +21,10 @@ etcd_image_dict:
 etcd_image: "{{ osm_etcd_image }}"
 
 # etcd run on a host => use etcdctl command directly
-# etcd run as a docker container => use docker exec
-# etcd run as a runc container => use runc exec
 etcdctl_dict:
   host: 'etcdctl'
-  docker: 'docker exec etcd_container etcdctl'
   static_pod: '/usr/local/bin/master-exec etcd etcd etcdctl'
-  runc: 'runc exec etcd etcdctl'
-r_etcd_common_etcdctl_command: "{{ etcdctl_dict[r_etcd_common_etcd_runtime | default('runc')] }}"
+r_etcd_common_etcdctl_command: "{{ etcdctl_dict[r_etcd_common_etcd_runtime] }}"
 
 # etcd server vars
 etcd_conf_dir: '/etc/etcd'
@@ -117,7 +111,6 @@ openshift_docker_service_name: "docker"
 
 etcd_ca_host: "{{ groups['oo_etcd_to_config'].0 }}"
 
-l_etcd_restart_is_pod: "{{ (inventory_hostname in groups['oo_masters']) | bool }}"
-l_etcd_restart_command: "{{ l_etcd_restart_is_pod | ternary('/usr/local/bin/master-restart etcd', 'systemctl restart etcd') }}"
+l_etcd_restart_command: "{{ l_etcd_static_pod | ternary('/usr/local/bin/master-restart etcd', 'systemctl restart etcd') }}"
 
 etcd_static_pod_location: "{{ openshift_control_plane_static_pod_location | default('/etc/origin/node/pods/') }}"

roles/etcd/tasks/auxiliary/drop_etcdctl.yml

@@ -1,14 +0,0 @@
----
-- name: Install etcd for etcdctl
-  package: name=etcd state=present
-  when: not openshift_is_containerized | bool
-  register: result
-  until: result is succeeded
-
-- name: Configure etcd profile.d aliases
-  template:
-    dest: "/etc/profile.d/etcdctl.sh"
-    src: etcdctl.sh.j2
-    mode: 0755
-    owner: root
-    group: root

roles/etcd/tasks/drop_etcdctl.yml

@@ -1,2 +1,14 @@
 ---
-- include_tasks: auxiliary/drop_etcdctl.yml
+- name: Install etcd for etcdctl
+  package: name=etcd state=present
+  when: not l_etcd_static_pod
+  register: result
+  until: result is succeeded
+
+- name: Configure etcd profile.d aliases
+  template:
+    dest: "/etc/profile.d/etcdctl.sh"
+    src: etcdctl.sh.j2
+    mode: 0755
+    owner: root
+    group: root

roles/etcd/tasks/restart.yml

@@ -1,3 +1,3 @@
 ---
 - name: restart etcd
-  command: /usr/local/bin/master-restart etcd
+  command: "{{ l_etcd_restart_command }}"

roles/etcd/tasks/rpm.yml

@@ -39,7 +39,7 @@
     template:
       dest: "{{ etcd_systemd_dir }}/custom.conf"
       src: custom.conf.j2
-  when: etcd_is_thirdparty
+  when: etcd_is_thirdparty | bool
 
 - name: Ensure etcd datadir ownership for thirdparty datadir
   file:

roles/etcd/tasks/runtime.yml

@@ -1,32 +0,0 @@
----
-- name: Check if etcd service exists
-  systemd:
-    name: "etcd"
-  ignore_errors: true
-  register: etcd_service
-
-- name: Set runtime to host
-  set_fact:
-    r_etcd_common_etcd_runtime: host
-  when: etcd_service.status.ActiveState == 'active' and not l_is_etcd_system_container
-
-- name: Set runtime to runc
-  set_fact:
-    r_etcd_common_etcd_runtime: runc
-  when: etcd_service.status.ActiveState == 'active' and l_is_etcd_system_container
-
-- name: Check if etcd service exists
-  systemd:
-    name: "etcd_container"
-  ignore_errors: true
-  register: etcd_container_service
-
-- name: Set runtime to docker
-  set_fact:
-    r_etcd_common_etcd_runtime: docker
-  when: etcd_container_service.status.ActiveState == 'active' and not l_is_etcd_system_container
-
-- name: Set runtime to runc
-  set_fact:
-    r_etcd_common_etcd_runtime: runc
-  when: etcd_container_service.status.ActiveState == 'active' and l_is_etcd_system_container

roles/etcd/tasks/upgrade/upgrade_image.yml

@@ -1,33 +0,0 @@
----
-# INPUT r_etcd_upgrade_version
-- name: Verify cluster is healthy pre-upgrade
-  command: "{{ etcdctlv2 }} cluster-health"
-
-- name: Get current image
-  shell: "grep 'ExecStart=' {{ etcd_service_file }} | awk '{print $NF}'"
-  register: current_image
-
-- name: Set new_etcd_image
-  set_fact:
-    new_etcd_image: "{{ current_image.stdout | regex_replace('/etcd.*$','/etcd:' ~ r_etcd_upgrade_version ) }}"
-
-- name: Pull new etcd image
-  command: "docker pull {{ new_etcd_image }}"
-
-- name: Update to latest etcd image
-  replace:
-    dest: "{{ etcd_service_file }}"
-    regexp: "{{ current_image.stdout }}$"
-    replace: "{{ new_etcd_image }}"
-
-- import_tasks: validate_etcd_conf.yml
-
-- name: restart etcd
-  command: /usr/local/bin/master-restart etcd
-
-- name: Verify cluster is healthy
-  command: "{{ etcdctlv2 }} cluster-health"
-  register: etcdctl
-  until: etcdctl.rc == 0
-  retries: 3
-  delay: 10

roles/etcd/tasks/upgrade/upgrade_rpm.yml

@@ -1,34 +0,0 @@
----
-# INPUT r_etcd_upgrade_version?
-
-# F23 GA'd with etcd 2.0, currently has 2.2 in updates
-# F24 GA'd with etcd-2.2, currently has 2.2 in updates
-# F25 Beta currently has etcd 3.0
-# RHEL 7.3.4 with etcd-3.1.3-1.el7
-# RHEL 7.3.3 with etcd-3.1.0-2.el7
-# RHEL 7.3.2 with etcd-3.0.15-1.el7
-
-- name: Verify cluster is healthy pre-upgrade
-  command: "{{ etcdctlv2 }} cluster-health"
-
-- set_fact:
-    l_etcd_target_package: "{{ 'etcd' if r_etcd_upgrade_version is not defined else 'etcd-'+r_etcd_upgrade_version+'*' }}"
-
-- name: Update etcd RPM to {{ l_etcd_target_package }}
-  package:
-    name: "{{ l_etcd_target_package }}"
-    state: latest
-  register: result
-  until: result is succeeded
-
-- import_tasks: validate_etcd_conf.yml
-
-- name: restart etcd
-  command: /usr/local/bin/master-restart etcd
-
-- name: Verify cluster is healthy
-  command: "{{ etcdctlv2 }} cluster-health"
-  register: etcdctl
-  until: etcdctl.rc == 0
-  retries: 3
-  delay: 10

roles/etcd/tasks/upgrade_image.yml

@@ -1,2 +0,0 @@
----
-- include_tasks: upgrade/upgrade_image.yml

roles/etcd/tasks/upgrade_rpm.yml

@@ -1,2 +1,34 @@
 ---
-- include_tasks: upgrade/upgrade_rpm.yml
+# INPUT r_etcd_upgrade_version?
+
+# F23 GA'd with etcd 2.0, currently has 2.2 in updates
+# F24 GA'd with etcd-2.2, currently has 2.2 in updates
+# F25 Beta currently has etcd 3.0
+# RHEL 7.3.4 with etcd-3.1.3-1.el7
+# RHEL 7.3.3 with etcd-3.1.0-2.el7
+# RHEL 7.3.2 with etcd-3.0.15-1.el7
+
+- name: Verify cluster is healthy pre-upgrade
+  command: "{{ etcdctlv2 }} cluster-health"
+
+- set_fact:
+    l_etcd_target_package: "{{ 'etcd' if r_etcd_upgrade_version is not defined else 'etcd-'+r_etcd_upgrade_version+'*' }}"
+
+- name: Update etcd RPM to {{ l_etcd_target_package }}
+  package:
+    name: "{{ l_etcd_target_package }}"
+    state: latest
+  register: result
+  until: result is succeeded
+
+- import_tasks: validate_etcd_conf.yml
+
+- name: restart etcd
+  command: "{{ l_etcd_restart_command }}"
+
+- name: Verify cluster is healthy
+  command: "{{ etcdctlv2 }} cluster-health"
+  register: etcdctl
+  until: etcdctl.rc == 0
+  retries: 3
+  delay: 10

roles/etcd/tasks/upgrade_static.yml

@@ -3,8 +3,6 @@
 
 # INPUT r_etcd_upgrade_version
 
-- include_tasks: runtime.yml
-
 - name: Verify cluster is healthy pre-upgrade
   command: "{{ etcdctlv2 }} cluster-health"
 

roles/etcd/tasks/version_detect.yml

@@ -1,5 +1,6 @@
 ---
-- block:
+- when: not l_etcd_static_pod
+  block:
   - name: Record RPM based etcd version
     command: rpm -qa --qf '%{version}' etcd\*
     args:
@@ -11,64 +12,3 @@
     changed_when: false
   - debug:
       msg: "Etcd rpm version {{ etcd_rpm_version.stdout }} detected"
-  when:
-  - not openshift_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 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 and not l_etcd_static_pod | 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:
-    - 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 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
-    - "'stdout' in etcd_container_version_static_pod"
-
-  - debug:
-      msg: "Etcd containerized version {{ etcd_container_version }} detected"
-    when: etcd_container_version is defined
-  when:
-  - openshift_is_containerized | bool

roles/etcd/templates/etcd.conf.j2

@@ -23,7 +23,7 @@ ETCD_LISTEN_CLIENT_URLS={{ etcd_listen_client_urls }}
 
 #[cluster]
 ETCD_INITIAL_ADVERTISE_PEER_URLS={{ etcd_initial_advertise_peer_urls }}
-{% if etcd_is_thirdparty %}
+{% if etcd_is_thirdparty | bool %}
 # TODO: This needs to be altered to support the correct etcd instances
 ETCD_INITIAL_CLUSTER={{ etcd_hostname}}={{ etcd_initial_advertise_peer_urls }}
 ETCD_INITIAL_CLUSTER_STATE={{ etcd_initial_cluster_state }}