Merge pull request #6515 from mgugino-upstream-stage/defacting

Automatic merge from submit-queue.

Remove some small items from openshift_facts

Remove some small items from openshift_facts that
don't need to be there.

roles/openshift_facts/library/openshift_facts.py

@@ -1278,35 +1278,10 @@ def set_container_facts_if_unset(facts):
             dict: the facts dict updated with the generated containerization
             facts
     """
-    deployment_type = facts['common']['deployment_type']
-    if deployment_type == 'openshift-enterprise':
-        master_image = 'openshift3/ose'
-        pod_image = 'openshift3/ose-pod'
-        router_image = 'openshift3/ose-haproxy-router'
-        registry_image = 'openshift3/ose-docker-registry'
-        deployer_image = 'openshift3/ose-deployer'
-    else:
-        master_image = 'openshift/origin'
-        pod_image = 'openshift/origin-pod'
-        router_image = 'openshift/origin-haproxy-router'
-        registry_image = 'openshift/origin-docker-registry'
-        deployer_image = 'openshift/origin-deployer'
-
     facts['common']['is_atomic'] = os.path.isfile('/run/ostree-booted')
 
     if 'is_containerized' not in facts['common']:
         facts['common']['is_containerized'] = facts['common']['is_atomic']
-    if 'pod_image' not in facts['common']:
-        facts['common']['pod_image'] = pod_image
-    if 'router_image' not in facts['common']:
-        facts['common']['router_image'] = router_image
-    if 'registry_image' not in facts['common']:
-        facts['common']['registry_image'] = registry_image
-    if 'deployer_image' not in facts['common']:
-        facts['common']['deployer_image'] = deployer_image
-    if 'master' in facts and 'master_image' not in facts['master']:
-        facts['master']['master_image'] = master_image
-        facts['master']['master_system_image'] = master_image
 
     if safe_get_bool(facts['common']['is_containerized']):
         facts['common']['client_binary'] = '/usr/local/bin/oc'

roles/openshift_loadbalancer/defaults/main.yml

@@ -2,6 +2,12 @@
 r_openshift_loadbalancer_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
 r_openshift_loadbalancer_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}"
 
+openshift_router_image_default_dict:
+  origin: 'openshift/origin-haproxy-router'
+  openshift-enterprise: 'openshift3/ose-haproxy-router'
+openshift_router_image_default: "{{ openshift_router_image_default_dict[openshift_deployment_type] }}"
+openshift_router_image: "{{ openshift_router_image_default }}"
+
 haproxy_frontends:
 - name: main
   binds:

roles/openshift_loadbalancer/tasks/main.yml

@@ -10,7 +10,7 @@
 
 - name: Pull haproxy image
   command: >
-    docker pull {{ openshift.common.router_image }}:{{ openshift_image_tag }}
+    docker pull {{ openshift_router_image }}:{{ openshift_image_tag }}
   when: openshift.common.is_containerized | bool
 
 - name: Create config directory for haproxy

roles/openshift_loadbalancer/templates/haproxy.docker.service.j2

@@ -5,7 +5,7 @@ PartOf={{ openshift_docker_service_name }}.service
 
 [Service]
 ExecStartPre=-/usr/bin/docker rm -f openshift_loadbalancer
-ExecStart=/usr/bin/docker run --rm --name openshift_loadbalancer {% for frontend in openshift_loadbalancer_frontends %} {% for bind in frontend.binds %} -p {{ bind |regex_replace('^[^:]*:(\d+).*$', '\\1') }}:{{ bind |regex_replace('^[^:]*:(\d+).*$', '\\1') }} {% endfor %} {% endfor %} -v /etc/haproxy/haproxy.cfg:/etc/haproxy/haproxy.cfg:ro --entrypoint=haproxy {{ openshift.common.router_image }}:{{ openshift_image_tag }} -f /etc/haproxy/haproxy.cfg
+ExecStart=/usr/bin/docker run --rm --name openshift_loadbalancer {% for frontend in openshift_loadbalancer_frontends %} {% for bind in frontend.binds %} -p {{ bind |regex_replace('^[^:]*:(\d+).*$', '\\1') }}:{{ bind |regex_replace('^[^:]*:(\d+).*$', '\\1') }} {% endfor %} {% endfor %} -v /etc/haproxy/haproxy.cfg:/etc/haproxy/haproxy.cfg:ro --entrypoint=haproxy {{ openshift_router_image }}:{{ openshift_image_tag }} -f /etc/haproxy/haproxy.cfg
 ExecStartPost=/usr/bin/sleep 10
 ExecStop=/usr/bin/docker stop openshift_loadbalancer
 LimitNOFILE={{ openshift_loadbalancer_limit_nofile | default(100000) }}

roles/openshift_master/defaults/main.yml

@@ -7,6 +7,12 @@ openshift_master_debug_level: "{{ debug_level | default(2) }}"
 r_openshift_master_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
 r_openshift_master_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}"
 
+osm_image_default_dict:
+  origin: 'openshift/origin'
+  openshift-enterprise: 'openshift3/ose'
+osm_image_default: "{{ osm_image_default_dict[openshift_deployment_type] }}"
+osm_image: "{{ osm_image_default }}"
+
 system_images_registry_dict:
   openshift-enterprise: "registry.access.redhat.com"
   origin: "docker.io"

roles/openshift_master/tasks/system_container.yml

@@ -2,7 +2,7 @@
 
 - name: Pre-pull master system container image
   command: >
-    atomic pull --storage=ostree {{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}
+    atomic pull --storage=ostree {{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ osm_image }}:{{ openshift_image_tag }}
   register: l_pull_result
   changed_when: "'Pulling layer' in l_pull_result.stdout"
 
@@ -14,15 +14,15 @@
 - name: Install or Update HA api master system container
   oc_atomic_container:
     name: "{{ openshift_service_type }}-master-api"
-    image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}"
+    image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ osm_image }}:{{ openshift_image_tag }}"
     state: latest
     values:
     - COMMAND=api
 
 - name: Install or Update HA controller master system container
   oc_atomic_container:
     name: "{{ openshift_service_type }}-master-controllers"
-    image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}"
+    image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ osm_image }}:{{ openshift_image_tag }}"
     state: latest
     values:
     - COMMAND=controllers

roles/openshift_master/tasks/systemd_units.yml

@@ -30,7 +30,7 @@
 # This is the image used for both HA and non-HA clusters:
 - name: Pre-pull master image
   command: >
-    docker pull {{ openshift.master.master_image }}:{{ openshift_image_tag }}
+    docker pull {{ osm_image }}:{{ openshift_image_tag }}
   register: l_pull_result
   changed_when: "'Downloaded newer image' in l_pull_result.stdout"
   when:

roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2

@@ -21,7 +21,7 @@ ExecStart=/usr/bin/docker run --rm --privileged --net=host \
   {% if openshift_cloudprovider_kind | default('') != '' -%} -v {{ openshift.common.config_base }}/cloudprovider:{{ openshift.common.config_base}}/cloudprovider {% endif -%} \
   -v /etc/pki:/etc/pki:ro \
   {% if l_bind_docker_reg_auth | default(False) %} -v {{ oreg_auth_credentials_path }}:/root/.docker:ro{% endif %}\
-  {{ openshift.master.master_image }}:${IMAGE_VERSION} start master api \
+  {{ osm_image }}:${IMAGE_VERSION} start master api \
   --config=${CONFIG_FILE} $OPTIONS
 ExecStartPost=/usr/bin/sleep 10
 ExecStop=/usr/bin/docker stop {{ openshift_service_type }}-master-api

roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2

@@ -20,7 +20,7 @@ ExecStart=/usr/bin/docker run --rm --privileged --net=host \
   {% if openshift_cloudprovider_kind | default('') != '' -%} -v {{ openshift.common.config_base }}/cloudprovider:{{ openshift.common.config_base}}/cloudprovider {% endif -%} \
   -v /etc/pki:/etc/pki:ro \
   {% if l_bind_docker_reg_auth | default(False) %} -v {{ oreg_auth_credentials_path }}:/root/.docker:ro{% endif %}\
-  {{ openshift.master.master_image }}:${IMAGE_VERSION} start master controllers \
+  {{ osm_image }}:${IMAGE_VERSION} start master controllers \
   --config=${CONFIG_FILE} $OPTIONS
 ExecStartPost=/usr/bin/sleep 10
 ExecStop=/usr/bin/docker stop {{ openshift_service_type }}-master-controllers

roles/openshift_master_facts/tasks/main.yml

@@ -72,7 +72,6 @@
       controller_args: "{{ osm_controller_args | default(None) }}"
       disabled_features: "{{ osm_disabled_features | default(None) }}"
       master_count: "{{ openshift_master_count | default(None) }}"
-      master_image: "{{ osm_image | default(None) }}"
       admission_plugin_config: "{{openshift_master_admission_plugin_config }}"
       kube_admission_plugin_config: "{{openshift_master_kube_admission_plugin_config | default(None) }}"  # deprecated, merged with admission_plugin_config
       oauth_template: "{{ openshift_master_oauth_template | default(None) }}"  # deprecated in origin 1.2 / OSE 3.2