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/lib_openshift/src/test/integration/oc_configmap.yml | 4 ++--
 roles/lib_openshift/src/test/unit/test_oc_configmap.py    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'roles/lib_openshift')

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')
-- 
cgit v1.2.3