Merge pull request #3680 from rhcarvalho/misc-fixes

Merged by openshift-bot

4 files changed, 32 insertions, 26 deletions

diff --git a/roles/lib_openshift/library/oc_project.py b/roles/lib_openshift/library/oc_project.py
index 0d0094c45..7700a83a3 100644
--- a/roles/lib_openshift/library/oc_project.py
+++ b/roles/lib_openshift/library/oc_project.py
@@ -1547,19 +1547,22 @@ class OCProject(OpenShiftCLI):
     def run_ansible(params, check_mode):
         '''run the idempotent ansible code'''
 
-        _ns = None
+        node_selector = None
         if params['node_selector'] is not None:
-            _ns = ','.join(params['node_selector'])
-
-        pconfig = ProjectConfig(params['name'],
-                                'None',
-                                params['kubeconfig'],
-                                {'admin': {'value': params['admin'], 'include': True},
-                                 'admin_role': {'value': params['admin_role'], 'include': True},
-                                 'description': {'value': params['description'], 'include': True},
-                                 'display_name': {'value': params['display_name'], 'include': True},
-                                 'node_selector': {'value': _ns, 'include': True},
-                                })
+            node_selector = ','.join(params['node_selector'])
+
+        pconfig = ProjectConfig(
+            params['name'],
+            'None',
+            params['kubeconfig'],
+            {
+                'admin': {'value': params['admin'], 'include': True},
+                'admin_role': {'value': params['admin_role'], 'include': True},
+                'description': {'value': params['description'], 'include': True},
+                'display_name': {'value': params['display_name'], 'include': True},
+                'node_selector': {'value': node_selector, 'include': True},
+            },
+        )
 
         oadm_project = OCProject(pconfig, verbose=params['debug'])
 
diff --git a/roles/lib_openshift/src/class/oc_project.py b/roles/lib_openshift/src/class/oc_project.py
index 5f02957b7..9ad8111a8 100644
--- a/roles/lib_openshift/src/class/oc_project.py
+++ b/roles/lib_openshift/src/class/oc_project.py
@@ -97,19 +97,22 @@ class OCProject(OpenShiftCLI):
     def run_ansible(params, check_mode):
         '''run the idempotent ansible code'''
 
-        _ns = None
+        node_selector = None
         if params['node_selector'] is not None:
-            _ns = ','.join(params['node_selector'])
-
-        pconfig = ProjectConfig(params['name'],
-                                'None',
-                                params['kubeconfig'],
-                                {'admin': {'value': params['admin'], 'include': True},
-                                 'admin_role': {'value': params['admin_role'], 'include': True},
-                                 'description': {'value': params['description'], 'include': True},
-                                 'display_name': {'value': params['display_name'], 'include': True},
-                                 'node_selector': {'value': _ns, 'include': True},
-                                })
+            node_selector = ','.join(params['node_selector'])
+
+        pconfig = ProjectConfig(
+            params['name'],
+            'None',
+            params['kubeconfig'],
+            {
+                'admin': {'value': params['admin'], 'include': True},
+                'admin_role': {'value': params['admin_role'], 'include': True},
+                'description': {'value': params['description'], 'include': True},
+                'display_name': {'value': params['display_name'], 'include': True},
+                'node_selector': {'value': node_selector, 'include': True},
+            },
+        )
 
         oadm_project = OCProject(pconfig, verbose=params['debug'])
 
diff --git a/roles/lib_openshift/src/test/unit/test_oc_project.py b/roles/lib_openshift/src/test/unit/test_oc_project.py
index 8e1a76323..fa454d035 100755
--- a/roles/lib_openshift/src/test/unit/test_oc_project.py
+++ b/roles/lib_openshift/src/test/unit/test_oc_project.py
@@ -21,7 +21,7 @@ from oc_project import OCProject  # noqa: E402
 
 class OCProjectTest(unittest.TestCase):
     '''
-     Test class for OCSecret
+     Test class for OCProject
     '''
 
     # run_ansible input parameters
diff --git a/roles/lib_openshift/src/test/unit/test_oc_route.py b/roles/lib_openshift/src/test/unit/test_oc_route.py
index 09c52a461..afdb5e4dc 100755
--- a/roles/lib_openshift/src/test/unit/test_oc_route.py
+++ b/roles/lib_openshift/src/test/unit/test_oc_route.py
@@ -21,7 +21,7 @@ from oc_route import OCRoute, locate_oc_binary  # noqa: E402
 
 class OCRouteTest(unittest.TestCase):
     '''
-     Test class for OCServiceAccount
+     Test class for OCRoute
     '''
 
     @mock.patch('oc_route.locate_oc_binary')