Merge pull request #7400 from mgugino-upstream-stage/deploy-type-2

Automatic merge from submit-queue.

 Refactor openshift.common.deployment_type

This commit refactors openshift.common.deployment_type
and openshift.common.deployment_subtype.

This commit is based on openshift.common.version refactor PR.

playbooks/common/openshift-cluster/upgrades/post_control_plane.yml

@@ -14,7 +14,7 @@
 # until after the next play to hopefully save some time polling.
 - import_playbook: ../../../openshift-hosted/private/upgrade.yml
 
-- name: Upgrade default router and default registry
+- name: Upgrade manageiq, templates, examples
   hosts: oo_first_master
   roles:
   - lib_utils

playbooks/init/basic_facts.yml

@@ -104,4 +104,6 @@
   tasks:
   - set_fact:
       openshift_web_console_install: False
-    when: openshift_deployment_subtype == 'registry' or ( osm_disabled_features is defined and 'WebConsole' in osm_disabled_features )
+    when:
+    - openshift_deployment_subtype is defined
+    - openshift_deployment_subtype == 'registry' or ( osm_disabled_features is defined and 'WebConsole' in osm_disabled_features )

playbooks/init/cluster_facts.yml

@@ -17,8 +17,6 @@
     openshift_facts:
       role: common
       local_facts:
-        deployment_type: "{{ openshift_deployment_type }}"
-        deployment_subtype: "{{ openshift_deployment_subtype | default(None) }}"
         hostname: "{{ openshift_hostname | default(None) }}"
         ip: "{{ openshift_ip | default(None) }}"
         public_hostname: "{{ openshift_public_hostname | default(None) }}"

playbooks/openshift-master/private/additional_config.yml

@@ -30,7 +30,7 @@
     - not openshift_is_atomic | bool
     - openshift_deployment_type == 'openshift-enterprise'
     - osm_use_cockpit is undefined or osm_use_cockpit | bool
-    - openshift_deployment_subtype != 'registry'
+    - (openshift_deployment_subtype | default('')) != 'registry'
   - role: flannel_register
     when: openshift_use_flannel | default(false) | bool
 

playbooks/openshift-master/private/config.yml

@@ -214,7 +214,7 @@
 
   post_tasks:
   - name: Create group for deployment type
-    group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }}
+    group_by: key=oo_masters_deployment_type_{{ openshift_deployment_type }}
     changed_when: False
 
 - name: Configure API Aggregation on masters

playbooks/openshift-node/private/manage_node.yml

@@ -9,5 +9,5 @@
     openshift_manage_node_is_master: "{{ ('oo_masters_to_config' in group_names) | bool }}"
   tasks:
   - name: Create group for deployment type
-    group_by: key=oo_nodes_deployment_type_{{ openshift.common.deployment_type }}
+    group_by: key=oo_nodes_deployment_type_{{ openshift_deployment_type }}
     changed_when: False

roles/container_runtime/tasks/common/pre.yml

@@ -6,7 +6,7 @@
   set_fact:
     l2_docker_additional_registries: "{{ l2_docker_additional_registries + [openshift_docker_ent_reg] }}"
   when:
-    - openshift.common.deployment_type == 'openshift-enterprise'
+    - openshift_deployment_type == 'openshift-enterprise'
     - openshift_docker_ent_reg != ''
     - openshift_docker_ent_reg not in l2_docker_additional_registries
     - not openshift_use_crio_only | bool

roles/openshift_examples/defaults/main.yml

@@ -24,7 +24,6 @@ infrastructure_origin_base: "{{ examples_base }}/infrastructure-templates/origin
 infrastructure_enterprise_base: "{{ examples_base }}/infrastructure-templates/enterprise"
 cockpit_ui_base: "{{ examples_base }}/infrastructure-templates/enterprise"
 
-
 openshift_examples_import_command: "create"
 registry_host: "{{ openshift_examples_registryurl.split('/')[0] if '.' in openshift_examples_registryurl.split('/')[0] else '' }}"
 

roles/openshift_facts/library/openshift_facts.py

@@ -375,33 +375,6 @@ def normalize_provider_facts(provider, metadata):
     return facts
 
 
-def set_identity_providers_if_unset(facts):
-    """ Set identity_providers fact if not already present in facts dict
-
-        Args:
-            facts (dict): existing facts
-        Returns:
-            dict: the facts dict updated with the generated identity providers
-            facts if they were not already present
-    """
-    if 'master' in facts:
-        deployment_type = facts['common']['deployment_type']
-        if 'identity_providers' not in facts['master']:
-            identity_provider = dict(
-                name='allow_all', challenge=True, login=True,
-                kind='AllowAllPasswordIdentityProvider'
-            )
-            if deployment_type == 'openshift-enterprise':
-                identity_provider = dict(
-                    name='deny_all', challenge=True, login=True,
-                    kind='DenyAllPasswordIdentityProvider'
-                )
-
-            facts['master']['identity_providers'] = [identity_provider]
-
-    return facts
-
-
 def set_url_facts_if_unset(facts):
     """ Set url facts if not already present in facts dict
 
@@ -518,31 +491,6 @@ def set_aggregate_facts(facts):
     return facts
 
 
-def set_deployment_facts_if_unset(facts):
-    """ Set Facts that vary based on deployment_type. This currently
-        includes master.registry_url
-
-        Args:
-            facts (dict): existing facts
-        Returns:
-            dict: the facts dict updated with the generated deployment_type
-            facts
-    """
-    if 'master' in facts:
-        deployment_type = facts['common']['deployment_type']
-        openshift_features = ['Builder', 'S2IBuilder', 'WebConsole']
-        if 'disabled_features' not in facts['master']:
-            if facts['common']['deployment_subtype'] == 'registry':
-                facts['master']['disabled_features'] = openshift_features
-        if 'registry_url' not in facts['master']:
-            registry_url = 'openshift/origin-${component}:${version}'
-            if deployment_type == 'openshift-enterprise':
-                registry_url = 'openshift3/ose-${component}:${version}'
-            facts['master']['registry_url'] = registry_url
-
-    return facts
-
-
 def set_sdn_facts_if_unset(facts, system_facts):
     """ Set sdn facts if not already present in facts dict
 
@@ -1207,17 +1155,7 @@ class OpenShiftFacts(object):
                                             additive_facts_to_overwrite)
         roles = local_facts.keys()
 
-        if 'common' in local_facts and 'deployment_type' in local_facts['common']:
-            deployment_type = local_facts['common']['deployment_type']
-        else:
-            deployment_type = 'origin'
-
-        if 'common' in local_facts and 'deployment_subtype' in local_facts['common']:
-            deployment_subtype = local_facts['common']['deployment_subtype']
-        else:
-            deployment_subtype = 'basic'
-
-        defaults = self.get_defaults(roles, deployment_type, deployment_subtype)
+        defaults = self.get_defaults(roles)
         provider_facts = self.init_provider_facts()
         facts = apply_provider_facts(defaults, provider_facts)
         facts = merge_facts(facts,
@@ -1225,8 +1163,6 @@ class OpenShiftFacts(object):
                             additive_facts_to_overwrite)
         facts['current_config'] = get_current_config(facts)
         facts = set_url_facts_if_unset(facts)
-        facts = set_identity_providers_if_unset(facts)
-        facts = set_deployment_facts_if_unset(facts)
         facts = set_sdn_facts_if_unset(facts, self.system_facts)
         facts = set_container_facts_if_unset(facts)
         facts = build_controller_args(facts)
@@ -1238,7 +1174,7 @@ class OpenShiftFacts(object):
         facts = set_nodename(facts)
         return dict(openshift=facts)
 
-    def get_defaults(self, roles, deployment_type, deployment_subtype):
+    def get_defaults(self, roles):
         """ Get default fact values
 
             Args:
@@ -1257,8 +1193,6 @@ class OpenShiftFacts(object):
 
         defaults['common'] = dict(ip=ip_addr,
                                   public_ip=ip_addr,
-                                  deployment_type=deployment_type,
-                                  deployment_subtype=deployment_subtype,
                                   hostname=hostname,
                                   public_hostname=hostname,
                                   portal_net='172.30.0.0/16',

roles/openshift_hosted_templates/defaults/main.yml

@@ -4,7 +4,11 @@ hosted_deployment_type: "{{ 'origin' if openshift_deployment_type == 'origin' el
 
 content_version: "{{ openshift_examples_content_version }}"
 
-registry_url: ""
-registry_host: "{{ registry_url.split('/')[0] if '.' in registry_url.split('/')[0] else '' }}"
+openshift_hosted_images_dict:
+  origin: 'openshift/origin-${component}:${version}'
+  openshift-enterprise: 'openshift3/ose-${component}:${version}'
+
+openshift_hosted_templates_registryurl: "{{ oreg_url_master | default(oreg_url) | default(openshift_hosted_images_dict[openshift_deployment_type]) }}"
+registry_host: "{{ openshift_hosted_templates_registryurl.split('/')[0] if '.' in openshift_hosted_templates_registryurl.split('/')[0] else '' }}"
 
 openshift_hosted_templates_import_command: 'create'

roles/openshift_master/defaults/main.yml

@@ -17,10 +17,36 @@ system_images_registry_dict:
   openshift-enterprise: "registry.access.redhat.com"
   origin: "docker.io"
 
+l_openshift_master_images_dict:
+  origin: 'openshift/origin-${component}:${version}'
+  openshift-enterprise: 'openshift3/ose-${component}:${version}'
+l_osm_registry_url_default: "{{ l_openshift_master_images_dict[openshift_deployment_type] }}"
+l_osm_registry_url: "{{ oreg_url_master | default(oreg_url) | default(l_osm_registry_url_default) }}"
+
 system_images_registry: "{{ system_images_registry_dict[openshift_deployment_type | default('origin')] }}"
 
 l_is_master_system_container: "{{ (openshift_use_master_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
 
+l_osm_id_providers_dict:
+  openshift-enterprise:
+  - name: 'deny_all'
+    challenge: True
+    login: True
+    kind: 'DenyAllPasswordIdentityProvider'
+  origin:
+  - name: 'allow_all'
+    challenge: True
+    login: True
+    kind: 'AllowAllPasswordIdentityProvider'
+
+openshift_master_identity_providers: "{{ l_osm_id_providers_dict[openshift_deployment_type] }}"
+
+l_osm_disabled_features: "{{ openshift_deployment_subtype == 'registry' | bool }}"
+l_osm_disabled_features_list:
+- Builder
+- S2IBuilder
+- WebConsole
+
 openshift_master_dns_port: 8053
 osm_project_request_template: ''
 osm_mcs_allocator_range: 's0:/2'

roles/openshift_master/tasks/main.yml

@@ -70,7 +70,7 @@
   when:
   - item.kind == 'HTPasswdPasswordIdentityProvider'
   - not openshift_is_atomic | bool
-  with_items: "{{ openshift.master.identity_providers }}"
+  with_items: "{{ openshift_master_identity_providers }}"
   register: result
   until: result is succeeded
 
@@ -80,7 +80,7 @@
     state: directory
   when:
   - item.kind == 'HTPasswdPasswordIdentityProvider'
-  with_items: "{{ openshift.master.identity_providers }}"
+  with_items: "{{ openshift_master_identity_providers }}"
 
 - name: Create the htpasswd file if needed
   template:
@@ -90,7 +90,7 @@
   when:
   - item.kind == 'HTPasswdPasswordIdentityProvider'
   - openshift.master.manage_htpasswd | bool
-  with_items: "{{ openshift.master.identity_providers }}"
+  with_items: "{{ openshift_master_identity_providers }}"
 
 - name: Ensure htpasswd file exists
   copy:
@@ -100,7 +100,7 @@
     mode: 0600
   when:
   - item.kind == 'HTPasswdPasswordIdentityProvider'
-  with_items: "{{ openshift.master.identity_providers }}"
+  with_items: "{{ openshift_master_identity_providers }}"
 
 - name: Create the ldap ca file if needed
   copy:
@@ -111,7 +111,7 @@
   when:
   - openshift.master.ldap_ca is defined
   - item.kind == 'LDAPPasswordIdentityProvider'
-  with_items: "{{ openshift.master.identity_providers }}"
+  with_items: "{{ openshift_master_identity_providers }}"
 
 - name: Create the openid ca file if needed
   copy:
@@ -123,7 +123,7 @@
   - openshift.master.openid_ca is defined
   - item.kind == 'OpenIDIdentityProvider'
   - item.ca | default('') != ''
-  with_items: "{{ openshift.master.identity_providers }}"
+  with_items: "{{ openshift_master_identity_providers }}"
 
 - name: Create the request header ca file if needed
   copy:
@@ -135,7 +135,7 @@
   - openshift.master.request_header_ca is defined
   - item.kind == 'RequestHeaderIdentityProvider'
   - item.clientCA | default('') != ''
-  with_items: "{{ openshift.master.identity_providers }}"
+  with_items: "{{ openshift_master_identity_providers }}"
 
 - name: Include push_via_dns.yml
   include_tasks: push_via_dns.yml
@@ -170,7 +170,7 @@
 
 - set_fact:
     # translate_idps is a custom filter in role lib_utils
-    translated_identity_providers: "{{ openshift.master.identity_providers | translate_idps('v1') }}"
+    translated_identity_providers: "{{ openshift_master_identity_providers | translate_idps('v1') }}"
 
 # TODO: add the validate parameter when there is a validation command to run
 - name: Create master config

roles/openshift_master/templates/master.yaml.v1.j2

@@ -63,8 +63,8 @@ corsAllowedOrigins:
 {% for custom_origin in openshift.master.custom_cors_origins | default("") %}
   - (?i)//{{ custom_origin | regex_escape() }}(:|\z)
 {% endfor %}
-{% if 'disabled_features' in openshift.master %}
-disabledFeatures: {{ openshift.master.disabled_features | to_json }}
+{% if l_osm_disabled_features %}
+disabledFeatures: {{ l_osm_disabled_features_list | to_json }}
 {% endif %}
 {% if openshift.master.embedded_dns | bool %}
 dnsConfig:
@@ -85,7 +85,7 @@ etcdStorageConfig:
   openShiftStoragePrefix: openshift.io
   openShiftStorageVersion: v1
 imageConfig:
-  format: {{ openshift.master.registry_url }}
+  format: {{ l_osm_registry_url }}
   latest: {{ openshift_master_image_config_latest }}
 {% if 'image_policy_config' in openshift.master %}
 imagePolicyConfig:{{ openshift.master.image_policy_config | lib_utils_to_padded_yaml(level=1) }}

roles/openshift_master_facts/tasks/main.yml

@@ -56,7 +56,6 @@
       session_encryption_secrets: "{{ openshift_master_session_encryption_secrets | default(None) }}"
       access_token_max_seconds: "{{ openshift_master_access_token_max_seconds | default(None) }}"
       auth_token_max_seconds: "{{ openshift_master_auth_token_max_seconds | default(None) }}"
-      identity_providers: "{{ openshift_master_identity_providers | default(None) }}"
       # oo_htpasswd_users_from_file is a custom filter in role lib_utils
       htpasswd_users: "{{ openshift_master_htpasswd_users | default(lookup('file', openshift_master_htpasswd_file) | oo_htpasswd_users_from_file if openshift_master_htpasswd_file is defined else None) }}"
       manage_htpasswd: "{{ openshift_master_manage_htpasswd | default(true) }}"

roles/openshift_version/tasks/first_master_containerized_version.yml

@@ -28,7 +28,7 @@
     openshift_version: "{{ (cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0:2] | join('-'))[1:] }}"
   when:
   - openshift_version is not defined
-  - openshift.common.deployment_type == 'origin'
+  - openshift_deployment_type == 'origin'
   - cli_image_version.stdout_lines[0].split('-') | length > 1
   - not openshift_use_crio_only
 
@@ -48,7 +48,7 @@
   - not openshift_use_crio_only
 
 - set_fact:
-    openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0:2][1:] | join('-') if openshift.common.deployment_type == 'origin' else cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}"
+    openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0:2][1:] | join('-') if openshift_deployment_type == 'origin' else cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}"
   when:
   - openshift_version is defined
   - openshift_version.split('.') | length == 2