From 4b8f66c37b865c7be59310854f5f9bd3de3e01bb Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Tue, 12 Sep 2017 11:07:12 -0400
Subject: 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.
---
 roles/openshift_facts/library/openshift_facts.py | 39 +++++-------------------
 1 file changed, 7 insertions(+), 32 deletions(-)

(limited to 'roles/openshift_facts')

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
-- 
cgit v1.2.1