Merge pull request #5378 from mgugino-upstream-stage/cleanup-deployment-types

Automatic merge from submit-queue

Cleanup old deployment types

Previously, openshift-ansible supported various
types of deployments using the variable "openshift_deployment_type"

Currently, openshift-ansible only supports two deployment types,
"origin" and "openshift-enterprise".

This commit removes all logic and references to deprecated
deployment types.

13 files changed, 71 insertions, 91 deletions

diff --git a/roles/lib_openshift/src/test/integration/oc_configmap.yml b/roles/lib_openshift/src/test/integration/oc_configmap.yml
index c0d200e73..6a452ccec 100755
--- a/roles/lib_openshift/src/test/integration/oc_configmap.yml
+++ b/roles/lib_openshift/src/test/integration/oc_configmap.yml
@@ -55,7 +55,7 @@
         config: "{{ filename }}"
       from_literal:
         foo: notbar
-        deployment_type: online
+        deployment_type: openshift-enterprise
 
   - name: fetch the updated configmap
     oc_configmap:
@@ -70,7 +70,7 @@
     assert:
       that:
       - cmout.results.results[0].metadata.name == 'configmaptest'
-      - cmout.results.results[0].data.deployment_type == 'online'
+      - cmout.results.results[0].data.deployment_type == 'openshift-enterprise'
       - cmout.results.results[0].data.foo == 'notbar'
   ###### end update test ###########
 
diff --git a/roles/lib_openshift/src/test/unit/test_oc_configmap.py b/roles/lib_openshift/src/test/unit/test_oc_configmap.py
index 318fd6167..27042c64b 100755
--- a/roles/lib_openshift/src/test/unit/test_oc_configmap.py
+++ b/roles/lib_openshift/src/test/unit/test_oc_configmap.py
@@ -79,7 +79,7 @@ class OCConfigMapTest(unittest.TestCase):
         ''' Testing a configmap create '''
         params = copy.deepcopy(OCConfigMapTest.params)
         params['from_file'] = {'test': '/root/file'}
-        params['from_literal'] = {'foo': 'bar', 'deployment_type': 'online'}
+        params['from_literal'] = {'foo': 'bar', 'deployment_type': 'openshift-enterprise'}
 
         configmap = '''{
                 "apiVersion": "v1",
@@ -100,7 +100,7 @@ class OCConfigMapTest(unittest.TestCase):
                 "apiVersion": "v1",
                 "data": {
                     "foo": "bar",
-                    "deployment_type": "online",
+                    "deployment_type": "openshift-enterprise",
                     "test": "this is a file\\n"
                 },
                 "kind": "ConfigMap",
@@ -128,7 +128,7 @@ class OCConfigMapTest(unittest.TestCase):
 
         self.assertTrue(results['changed'])
         self.assertEqual(results['results']['results'][0]['metadata']['name'], 'configmap')
-        self.assertEqual(results['results']['results'][0]['data']['deployment_type'], 'online')
+        self.assertEqual(results['results']['results'][0]['data']['deployment_type'], 'openshift-enterprise')
 
     @unittest.skipIf(six.PY3, 'py2 test only')
     @mock.patch('os.path.exists')
diff --git a/roles/openshift_examples/README.md b/roles/openshift_examples/README.md
index 8cc479c73..014cef111 100644
--- a/roles/openshift_examples/README.md
+++ b/roles/openshift_examples/README.md
@@ -21,13 +21,13 @@ Facts
 Role Variables
 --------------
 
-| Name                                | Default value                                       |                                          |
-|-------------------------------------|-----------------------------------------------------|------------------------------------------|
-| openshift_examples_load_centos      | true when openshift_deployment_typenot 'enterprise' | Load centos image streams                |
-| openshift_examples_load_rhel        | true if openshift_deployment_type is 'enterprise'   | Load rhel image streams                  |
-| openshift_examples_load_db_templates| true                                                | Loads database templates                 |
-| openshift_examples_load_quickstarts | true                                                | Loads quickstarts ie: nodejs, rails, etc |
-| openshift_examples_load_xpaas       | false                                               | Loads xpass streams and templates        |
+| Name                                | Default value                                                  |                                          |
+|-------------------------------------|----------------------------------------------------------------|------------------------------------------|
+| openshift_examples_load_centos      | true when openshift_deployment_type not 'openshift-enterprise' | Load centos image streams                |
+| openshift_examples_load_rhel        | true if openshift_deployment_type is 'openshift-enterprise'    | Load rhel image streams                  |
+| openshift_examples_load_db_templates| true                                                           | Loads database templates                 |
+| openshift_examples_load_quickstarts | true                                                           | Loads quickstarts ie: nodejs, rails, etc |
+| openshift_examples_load_xpaas       | false                                                          | Loads xpass streams and templates        |
 
 
 Dependencies
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 517e0231d..a76751e81 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -477,11 +477,7 @@ def set_selectors(facts):
             facts if they were not already present
 
     """
-    deployment_type = facts['common']['deployment_type']
-    if deployment_type == 'online':
-        selector = "type=infra"
-    else:
-        selector = "region=infra"
+    selector = "region=infra"
 
     if 'hosted' not in facts:
         facts['hosted'] = {}
@@ -568,7 +564,7 @@ def set_identity_providers_if_unset(facts):
                 name='allow_all', challenge=True, login=True,
                 kind='AllowAllPasswordIdentityProvider'
             )
-            if deployment_type in ['enterprise', 'atomic-enterprise', 'openshift-enterprise']:
+            if deployment_type == 'openshift-enterprise':
                 identity_provider = dict(
                     name='deny_all', challenge=True, login=True,
                     kind='DenyAllPasswordIdentityProvider'
@@ -770,13 +766,11 @@ def set_deployment_facts_if_unset(facts):
             service_type = 'atomic-openshift'
             if deployment_type == 'origin':
                 service_type = 'origin'
-            elif deployment_type in ['enterprise']:
-                service_type = 'openshift'
             facts['common']['service_type'] = service_type
 
     if 'docker' in facts:
         deployment_type = facts['common']['deployment_type']
-        if deployment_type in ['enterprise', 'atomic-enterprise', 'openshift-enterprise']:
+        if deployment_type == 'openshift-enterprise':
             addtl_regs = facts['docker'].get('additional_registries', [])
             ent_reg = 'registry.access.redhat.com'
             if ent_reg not in addtl_regs:
@@ -787,30 +781,21 @@ def set_deployment_facts_if_unset(facts):
             deployment_type = facts['common']['deployment_type']
             if 'registry_url' not in facts[role]:
                 registry_url = 'openshift/origin-${component}:${version}'
-                if deployment_type in ['enterprise', 'online', 'openshift-enterprise']:
+                if deployment_type == 'openshift-enterprise':
                     registry_url = 'openshift3/ose-${component}:${version}'
-                elif deployment_type == 'atomic-enterprise':
-                    registry_url = 'aep3_beta/aep-${component}:${version}'
                 facts[role]['registry_url'] = registry_url
 
     if 'master' in facts:
         deployment_type = facts['common']['deployment_type']
         openshift_features = ['Builder', 'S2IBuilder', 'WebConsole']
-        if 'disabled_features' in facts['master']:
-            if deployment_type == 'atomic-enterprise':
-                curr_disabled_features = set(facts['master']['disabled_features'])
-                facts['master']['disabled_features'] = list(curr_disabled_features.union(openshift_features))
-        else:
+        if 'disabled_features' not in facts['master']:
             if facts['common']['deployment_subtype'] == 'registry':
                 facts['master']['disabled_features'] = openshift_features
 
     if 'node' in facts:
         deployment_type = facts['common']['deployment_type']
         if 'storage_plugin_deps' not in facts['node']:
-            if deployment_type in ['openshift-enterprise', 'atomic-enterprise', 'origin']:
-                facts['node']['storage_plugin_deps'] = ['ceph', 'glusterfs', 'iscsi']
-            else:
-                facts['node']['storage_plugin_deps'] = []
+            facts['node']['storage_plugin_deps'] = ['ceph', 'glusterfs', 'iscsi']
 
     return facts
 
@@ -1671,7 +1656,7 @@ def set_container_facts_if_unset(facts):
             facts
     """
     deployment_type = facts['common']['deployment_type']
-    if deployment_type in ['enterprise', 'openshift-enterprise']:
+    if deployment_type == 'openshift-enterprise':
         master_image = 'openshift3/ose'
         cli_image = master_image
         node_image = 'openshift3/node'
@@ -1681,16 +1666,6 @@ def set_container_facts_if_unset(facts):
         router_image = 'openshift3/ose-haproxy-router'
         registry_image = 'openshift3/ose-docker-registry'
         deployer_image = 'openshift3/ose-deployer'
-    elif deployment_type == 'atomic-enterprise':
-        master_image = 'aep3_beta/aep'
-        cli_image = master_image
-        node_image = 'aep3_beta/node'
-        ovs_image = 'aep3_beta/openvswitch'
-        etcd_image = 'registry.access.redhat.com/rhel7/etcd'
-        pod_image = 'aep3_beta/aep-pod'
-        router_image = 'aep3_beta/aep-haproxy-router'
-        registry_image = 'aep3_beta/aep-docker-registry'
-        deployer_image = 'aep3_beta/aep-deployer'
     else:
         master_image = 'openshift/origin'
         cli_image = master_image
diff --git a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
index 9c35f0f92..98372d979 100644
--- a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
@@ -109,8 +109,6 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
         # containerized etcd may not have openshift_image_tag, see bz 1466622
         image_tag = self.get_var("openshift_image_tag", default="latest")
         image_info = DEPLOYMENT_IMAGE_INFO[deployment_type]
-        if not image_info:
-            return required
 
         # template for images that run on top of OpenShift
         image_url = "{}/{}-{}:{}".format(image_info["namespace"], image_info["name"], "${component}", "${version}")
@@ -160,7 +158,7 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
         deployment_type = self.get_var("openshift_deployment_type")
         if deployment_type == "origin" and "docker.io" not in regs:
             regs.append("docker.io")
-        elif "enterprise" in deployment_type and "registry.access.redhat.com" not in regs:
+        elif deployment_type == 'openshift-enterprise' and "registry.access.redhat.com" not in regs:
             regs.append("registry.access.redhat.com")
 
         return regs
diff --git a/roles/openshift_health_checker/test/docker_image_availability_test.py b/roles/openshift_health_checker/test/docker_image_availability_test.py
index 6a7c16c7e..952fa9aa6 100644
--- a/roles/openshift_health_checker/test/docker_image_availability_test.py
+++ b/roles/openshift_health_checker/test/docker_image_availability_test.py
@@ -23,8 +23,6 @@ def task_vars():
 @pytest.mark.parametrize('deployment_type, is_containerized, group_names, expect_active', [
     ("origin", True, [], True),
     ("openshift-enterprise", True, [], True),
-    ("enterprise", True, [], False),
-    ("online", True, [], False),
     ("invalid", True, [], False),
     ("", True, [], False),
     ("origin", False, [], False),
@@ -103,6 +101,39 @@ def test_all_images_unavailable(task_vars):
     assert "required Docker images are not available" in actual['msg']
 
 
+def test_no_known_registries():
+    def execute_module(module_name=None, *_):
+        if module_name == "command":
+            return {
+                'failed': True,
+            }
+
+        return {
+            'changed': False,
+        }
+
+    def mock_known_docker_registries():
+        return []
+
+    dia = DockerImageAvailability(execute_module, task_vars=dict(
+        openshift=dict(
+            common=dict(
+                service_type='origin',
+                is_containerized=False,
+                is_atomic=False,
+            ),
+            docker=dict(additional_registries=["docker.io"]),
+        ),
+        openshift_deployment_type="openshift-enterprise",
+        openshift_image_tag='latest',
+        group_names=['nodes', 'masters'],
+    ))
+    dia.known_docker_registries = mock_known_docker_registries
+    actual = dia.run()
+    assert actual['failed']
+    assert "Unable to retrieve any docker registries." in actual['msg']
+
+
 @pytest.mark.parametrize("message,extra_words", [
     (
         "docker image update failure",
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 6203bfc7b..94b7df1fc 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -224,7 +224,7 @@
   - restart master api
 
 - set_fact:
-    translated_identity_providers: "{{ openshift.master.identity_providers | translate_idps('v1', openshift.common.version, openshift.common.deployment_type) }}"
+    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
diff --git a/roles/openshift_master_facts/filter_plugins/openshift_master.py b/roles/openshift_master_facts/filter_plugins/openshift_master.py
index 56c864ec7..f7f3ac2b1 100644
--- a/roles/openshift_master_facts/filter_plugins/openshift_master.py
+++ b/roles/openshift_master_facts/filter_plugins/openshift_master.py
@@ -6,10 +6,6 @@ Custom filters for use in openshift-master
 import copy
 import sys
 
-# pylint import-error disabled because pylint cannot find the package
-# when installed in a virtualenv
-from distutils.version import LooseVersion  # pylint: disable=no-name-in-module,import-error
-
 from ansible import errors
 from ansible.parsing.yaml.dumper import AnsibleDumper
 from ansible.plugins.filter.core import to_bool as ansible_bool
@@ -82,23 +78,8 @@ class IdentityProviderBase(object):
         self._allow_additional = True
 
     @staticmethod
-    def validate_idp_list(idp_list, openshift_version, deployment_type):
+    def validate_idp_list(idp_list):
         ''' validates a list of idps '''
-        login_providers = [x.name for x in idp_list if x.login]
-
-        multiple_logins_unsupported = False
-        if len(login_providers) > 1:
-            if deployment_type in ['enterprise', 'online', 'atomic-enterprise', 'openshift-enterprise']:
-                if LooseVersion(openshift_version) < LooseVersion('3.2'):
-                    multiple_logins_unsupported = True
-            if deployment_type in ['origin']:
-                if LooseVersion(openshift_version) < LooseVersion('1.2'):
-                    multiple_logins_unsupported = True
-        if multiple_logins_unsupported:
-            raise errors.AnsibleFilterError("|failed multiple providers are "
-                                            "not allowed for login. login "
-                                            "providers: {0}".format(', '.join(login_providers)))
-
         names = [x.name for x in idp_list]
         if len(set(names)) != len(names):
             raise errors.AnsibleFilterError("|failed more than one provider configured with the same name")
@@ -471,7 +452,7 @@ class FilterModule(object):
     ''' Custom ansible filters for use by the openshift_master role'''
 
     @staticmethod
-    def translate_idps(idps, api_version, openshift_version, deployment_type):
+    def translate_idps(idps, api_version):
         ''' Translates a list of dictionaries into a valid identityProviders config '''
         idp_list = []
 
@@ -487,7 +468,7 @@ class FilterModule(object):
             idp_inst.set_provider_items()
             idp_list.append(idp_inst)
 
-        IdentityProviderBase.validate_idp_list(idp_list, openshift_version, deployment_type)
+        IdentityProviderBase.validate_idp_list(idp_list)
         return u(yaml.dump([idp.to_dict() for idp in idp_list],
                            allow_unicode=True,
                            default_flow_style=False,
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index ef79b6ac0..e82fb42b8 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -2,7 +2,8 @@
 - fail:
     msg: "SELinux is disabled, This deployment type requires that SELinux is enabled."
   when:
-    - (not ansible_selinux or ansible_selinux.status != 'enabled') and deployment_type in ['enterprise', 'online', 'atomic-enterprise', 'openshift-enterprise']
+    - (not ansible_selinux or ansible_selinux.status != 'enabled')
+    - deployment_type == 'openshift-enterprise'
     - not openshift_use_crio | default(false)
 
 - name: setup firewall
diff --git a/roles/openshift_repos/README.md b/roles/openshift_repos/README.md
index abd1997dd..ce3b51454 100644
--- a/roles/openshift_repos/README.md
+++ b/roles/openshift_repos/README.md
@@ -1,4 +1,4 @@
-OpenShift Repos 
+OpenShift Repos
 ================
 
 Configures repositories for an OpenShift installation
@@ -12,10 +12,10 @@ rhel-7-server-extra-rpms, and rhel-7-server-ose-3.0-rpms repos.
 Role Variables
 --------------
 
-| Name                          | Default value |                                    |
-|-------------------------------|---------------|------------------------------------|
-| openshift_deployment_type     | None          | Possible values enterprise, origin |
-| openshift_additional_repos    | {}            | TODO                               |
+| Name                          | Default value |                                              |
+|-------------------------------|---------------|----------------------------------------------|
+| openshift_deployment_type     | None          | Possible values openshift-enterprise, origin |
+| openshift_additional_repos    | {}            | TODO                                         |
 
 Dependencies
 ------------
diff --git a/roles/openshift_sanitize_inventory/vars/main.yml b/roles/openshift_sanitize_inventory/vars/main.yml
index da48e42c1..37e88758d 100644
--- a/roles/openshift_sanitize_inventory/vars/main.yml
+++ b/roles/openshift_sanitize_inventory/vars/main.yml
@@ -1,7 +1,4 @@
 ---
 # origin uses community packages named 'origin'
-# online currently uses 'openshift' packages
-# enterprise is used for OSE 3.0 < 3.1 which uses packages named 'openshift'
-# atomic-enterprise uses Red Hat packages named 'atomic-openshift'
-# openshift-enterprise uses Red Hat packages named 'atomic-openshift' starting with OSE 3.1
-known_openshift_deployment_types: ['origin', 'online', 'enterprise', 'atomic-enterprise', 'openshift-enterprise']
+# openshift-enterprise uses Red Hat packages named 'atomic-openshift'
+known_openshift_deployment_types: ['origin', 'openshift-enterprise']
diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml
index 39d59db70..9738929d2 100644
--- a/roles/rhel_subscribe/tasks/enterprise.yml
+++ b/roles/rhel_subscribe/tasks/enterprise.yml
@@ -3,20 +3,17 @@
   command: subscription-manager repos --disable="*"
 
 - set_fact:
-    default_ose_version: '3.0'
-  when: deployment_type == 'enterprise'
-
-- set_fact:
     default_ose_version: '3.6'
-  when: deployment_type in ['atomic-enterprise', 'openshift-enterprise']
+  when: deployment_type == 'openshift-enterprise'
 
 - set_fact:
     ose_version: "{{ lookup('oo_option', 'ose_version') | default(default_ose_version, True) }}"
 
 - fail:
     msg: "{{ ose_version }} is not a valid version for {{ deployment_type }} deployment type"
-  when: ( deployment_type == 'enterprise' and ose_version not in ['3.0'] ) or
-        ( deployment_type in ['atomic-enterprise', 'openshift-enterprise'] and ose_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6'] )
+  when:
+    - deployment_type == 'openshift-enterprise'
+    - ose_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6'] )
 
 - name: Enable RHEL repositories
   command: subscription-manager repos \
diff --git a/roles/rhel_subscribe/tasks/main.yml b/roles/rhel_subscribe/tasks/main.yml
index 2a2cf40f3..c49512146 100644
--- a/roles/rhel_subscribe/tasks/main.yml
+++ b/roles/rhel_subscribe/tasks/main.yml
@@ -69,5 +69,5 @@
 
 - include: enterprise.yml
   when:
-  - deployment_type in [ 'enterprise', 'atomic-enterprise', 'openshift-enterprise' ]
+  - deployment_type == 'openshift-enterprise'
   - not ostree_booted.stat.exists | bool