container_runtime: cleanup unused bits

roles/container_runtime/defaults/main.yml

@@ -1,27 +1,14 @@
 ---
 docker_cli_auth_config_path: '/root/.docker'
-openshift_docker_signature_verification: False
 
-openshift_docker_selinux_enabled: True
 openshift_docker_service_name: "docker"
 
-openshift_docker_hosted_registry_insecure: False  # bool
-
-openshift_docker_hosted_registry_network: "{{ openshift.common.portal_net }}"
-
 openshift_docker_additional_registries: []
 openshift_docker_blocked_registries: []
 openshift_docker_insecure_registries: []
 
 openshift_docker_ent_reg: 'registry.redhat.io'
 
-openshift_docker_options: False  # str
-openshift_docker_log_driver: False  # str
-openshift_docker_log_options_defaults:
-  json-file:
-  - "max-size=50m"
-openshift_docker_log_options: "{{ openshift_docker_log_options_defaults[openshift_docker_log_driver] | default([]) }}"
-
 # The l2_docker_* variables convert csv strings to lists, if
 # necessary.  These variables should be used in place of their respective
 # openshift_docker_* counterparts to ensure the properly formatted lists are
@@ -29,9 +16,7 @@ openshift_docker_log_options: "{{ openshift_docker_log_options_defaults[openshif
 l2_docker_additional_registries: "{% if openshift_docker_additional_registries is string %}{% if openshift_docker_additional_registries == '' %}[]{% elif ',' in openshift_docker_additional_registries %}{{ openshift_docker_additional_registries.split(',') | list }}{% else %}{{ [ openshift_docker_additional_registries ] }}{% endif %}{% else %}{{ openshift_docker_additional_registries }}{% endif %}"
 l2_docker_blocked_registries: "{% if openshift_docker_blocked_registries is string %}{% if openshift_docker_blocked_registries == '' %}[]{% elif ',' in openshift_docker_blocked_registries %}{{ openshift_docker_blocked_registries.split(',') | list }}{% else %}{{ [ openshift_docker_blocked_registries ] }}{% endif %}{% else %}{{ openshift_docker_blocked_registries }}{% endif %}"
 l2_docker_insecure_registries: "{% if openshift_docker_insecure_registries is string %}{% if openshift_docker_insecure_registries == '' %}[]{% elif ',' in openshift_docker_insecure_registries %}{{ openshift_docker_insecure_registries.split(',') | list }}{% else %}{{ [ openshift_docker_insecure_registries ] }}{% endif %}{% else %}{{ openshift_docker_insecure_registries }}{% endif %}"
-l2_docker_log_options: "{% if openshift_docker_log_options is string %}{% if ',' in openshift_docker_log_options %}{{ openshift_docker_log_options.split(',') | list }}{% else %}{{ [ openshift_docker_log_options ] }}{% endif %}{% else %}{{ openshift_docker_log_options }}{% endif %}"
 
-openshift_docker_use_etc_containers: False
 containers_registries_conf_path: /etc/containers/registries.conf
 
 r_crio_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
@@ -62,21 +47,6 @@ docker_storage_extra_options:
 
 container_runtime_extra_storage: []
 
-# Set local versions of facts that must be in json format for container-daemon.json
-# NOTE: When jinja2.9+ is used the container-daemon.json file can move to using tojson
-l_docker_log_options: "{{ l2_docker_log_options | to_json }}"
-l_docker_log_options_dict: "{{ l2_docker_log_options | lib_utils_oo_list_to_dict | to_json }}"
-l_docker_additional_registries: "{{ l2_docker_additional_registries | to_json }}"
-l_docker_blocked_registries: "{{ l2_docker_blocked_registries | to_json }}"
-l_docker_insecure_registries: "{{ l2_docker_insecure_registries | to_json }}"
-l_docker_selinux_enabled: "{{ openshift_docker_selinux_enabled | to_json }}"
-
-docker_http_proxy: "{{ openshift_http_proxy | default('') }}"
-docker_https_proxy: "{{ openshift.common.https_proxy | default('') }}"
-docker_no_proxy: "{{ openshift.common.no_proxy | default('') }}"
-
-l_required_docker_version: '1.13'
-
 l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l2_docker_insecure_registries)) }}"
 l_crio_registries: "{{ l2_docker_additional_registries + ['docker.io'] }}"
 l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}"

roles/container_runtime/handlers/main.yml

@@ -1,16 +1,4 @@
 ---
-
-- name: restart container runtime
-  systemd:
-    name: "{{ openshift_docker_service_name }}"
-    state: restarted
-    daemon_reload: yes
-  register: r_docker_restart_docker_result
-  until: not (r_docker_restart_docker_result is failed)
-  retries: 3
-  delay: 30
-  when: not docker_service_status_changed | default(false) | bool
-
 - name: restart udev
   systemd:
     name: systemd-udevd

roles/container_runtime/tasks/docker_restart.yml

@@ -1,30 +0,0 @@
----
-- name: Restart docker
-  service: name=docker state=restarted
-  register: l_docker_restart_docker_in_upgrade_result
-  until: not (l_docker_restart_docker_in_upgrade_result is failed)
-  retries: 3
-  delay: 30
-
-- name: Restart static master services
-  command: /usr/local/bin/master-restart "{{ item }}"
-  with_items:
-  - api
-  - controllers
-  - etcd
-  failed_when: false
-
-- name: Restart node service
-  service: name={{ item }} state=started
-  with_items:
-  - "{{ openshift_service_type }}-node"
-  failed_when: false
-
-- name: Wait for master API to come back online
-  wait_for:
-    host: "{{ openshift.common.hostname }}"
-    state: started
-    delay: 10
-    port: "{{ openshift_master_api_port }}"
-    timeout: 600
-  when: inventory_hostname in groups.oo_masters_to_config

roles/container_runtime/tasks/docker_sanity.yml

@@ -1,19 +0,0 @@
----
-# Sanity checks to ensure the role will complete and provide helpful error
-# messages for common problems.
-
-- name: Error out if Docker pre-installed but too old
-  fail:
-    msg: "Docker {{ curr_docker_version.stdout }} is installed, but >= {{ l_required_docker_version }} is required."
-  when:
-  - not (curr_docker_version is skipped)
-  - curr_docker_version.stdout != ''
-  - curr_docker_version.stdout is version(l_required_docker_version, '<')
-  - not (docker_version is defined)
-
-- name: Error out if requested Docker is too old
-  fail:
-    msg: "Docker {{ docker_version }} requested, but >= {{ l_required_docker_version }} is required."
-  when:
-  - docker_version is defined
-  - docker_version is version(l_required_docker_version, '<')

roles/container_runtime/tasks/docker_upgrade_check.yml

@@ -1,63 +0,0 @@
----
-
-# This snippet determines if a Docker upgrade is required by checking the inventory
-# variables, the available packages, and sets l_docker_upgrade to True if so.
-
-- set_fact:
-    docker_upgrade: True
-  when: docker_upgrade is not defined
-
-- name: Check if Docker is installed
-  command: rpm -q docker
-  args:
-    warn: no
-  register: pkg_check
-  failed_when: pkg_check.rc > 1
-  changed_when: no
-
-- name: Get current version of Docker
-  command: "{{ repoquery_installed }} --qf '%{version}' docker"
-  register: curr_docker_version
-  retries: 4
-  until: curr_docker_version is succeeded
-  changed_when: false
-
-- name: Get latest available version of Docker
-  command: >
-    {{ repoquery_cmd }} --qf '%{version}' "docker"
-  register: avail_docker_version
-  retries: 4
-  until: avail_docker_version is succeeded
-  # Don't expect docker rpm to be available on hosts that don't already have it installed:
-  when:
-    - pkg_check.rc == 0
-  failed_when: false
-  changed_when: false
-
-- name: Required docker version not available
-  fail:
-    msg: "This playbook requires access to Docker {{ l_required_docker_version }} or later"
-  # Disable the 1.12 requirement if the user set a specific Docker version
-  when:
-    - docker_version is not defined
-    - docker_upgrade | bool
-    - pkg_check.rc == 0
-    - avail_docker_version.stdout == "" or avail_docker_version.stdout is version(l_required_docker_version,'<')
-
-# Default l_docker_upgrade to False, we'll set to True if an upgrade is required:
-- set_fact:
-    l_docker_upgrade: False
-
-# Make sure a docker_version is set if none was requested:
-- set_fact:
-    docker_version: "{{ avail_docker_version.stdout }}"
-  when:
-    - pkg_check.rc == 0
-    - docker_version is not defined
-
-- name: Flag for Docker upgrade if necessary
-  set_fact:
-    l_docker_upgrade: True
-  when:
-    - pkg_check.rc == 0
-    - curr_docker_version.stdout is version(docker_version,'<')

roles/container_runtime/tasks/package_docker.yml

@@ -1 +0,0 @@
----

roles/container_runtime/templates/custom.conf.j2

@@ -1,11 +0,0 @@
-# {{ ansible_managed }}
-
-[Unit]
-Wants=iptables.service
-After=iptables.service
-
-# The following line is a work-around to ensure docker is restarted whenever
-# iptables is restarted.  This ensures the proper iptables rules will be in
-# place for docker.
-# Note:  This will also cause docker to be stopped if iptables is stopped.
-PartOf=iptables.service

roles/container_runtime/templates/daemon.json

@@ -1,20 +0,0 @@
-{
-    "authorization-plugins": ["rhel-push-plugin"],
-    "default-runtime": "oci",
-    "containerd": "/run/containerd.sock",
-    "disable-legacy-registry": false,
-    "exec-opts": ["native.cgroupdriver=systemd"],
-    "insecure-registries": {{ l_docker_insecure_registries }},
-{% if openshift_docker_log_driver  %}
-    "log-driver": "{{ openshift_docker_log_driver }}",
-{%- endif %}
-    "log-opts": {{ l_docker_log_options_dict }},
-    "runtimes": {
-	"oci": {
-	    "path": "/usr/libexec/docker/docker-runc-current"
-	}
-    },
-    "selinux-enabled": {{ l_docker_selinux_enabled | lower }},
-    "add-registry": {{ l_docker_additional_registries }},
-    "block-registry": {{ l_docker_blocked_registries }}
-}

roles/container_runtime/templates/systemcontainercustom.conf.j2

@@ -1,17 +0,0 @@
-# {{ ansible_managed }}
-
-[Service]
-{% if "http_proxy" in openshift.common %}
-Environment=HTTP_PROXY={{ docker_http_proxy }}
-{% endif -%}
-{% if "https_proxy" in openshift.common %}
-Environment=HTTPS_PROXY={{ docker_http_proxy }}
-{% endif -%}
-{% if "no_proxy" in openshift.common %}
-Environment=NO_PROXY={{ docker_no_proxy }}
-{% endif %}
-{%- if not (os_firewall_use_firewalld | default(False)) | bool %}
-[Unit]
-Wants=iptables.service
-After=iptables.service
-{%- endif %}

roles/container_runtime/vars/main.yml

@@ -1,5 +0,0 @@
----
-docker_systemd_dir: /etc/systemd/system/docker.service.d
-container_engine_systemd_dir: /etc/systemd/system/container-engine.service.d
-docker_conf_dir: /etc/docker/
-udevw_udevd_dir: /etc/systemd/system/systemd-udevd.service.d