Fixing docs. Fixed default_cert suggestion.

1 files changed, 23 insertions, 7 deletions

diff --git a/roles/lib_openshift/src/class/oc_adm_registry.py b/roles/lib_openshift/src/class/oc_adm_registry.py
index f11737086..505c4db81 100644
--- a/roles/lib_openshift/src/class/oc_adm_registry.py
+++ b/roles/lib_openshift/src/class/oc_adm_registry.py
@@ -86,7 +86,7 @@ class Registry(OpenShiftCLI):
     def prepared_registry(self):
         ''' prepared_registry property '''
         if not self.__prepared_registry:
-            results = self._prepare_registry()
+            results = self.prepare_registry()
             if not results:
                 raise RegistryException('Could not perform registry preparation.')
             self.__prepared_registry = results
@@ -100,13 +100,14 @@ class Registry(OpenShiftCLI):
 
     def force_prepare_registry(self):
         '''force a registry prep'''
-        self._prepare_registry = None
+        self.__prepared_registry = None
 
     def get(self):
         ''' return the self.registry_parts '''
         self.deploymentconfig = None
         self.service = None
 
+        rval = 0
         for part in self.registry_parts:
             result = self._get(part['kind'], rname=part['name'])
             if result['returncode'] == 0 and part['kind'] == 'dc':
@@ -114,7 +115,11 @@ class Registry(OpenShiftCLI):
             elif result['returncode'] == 0 and part['kind'] == 'svc':
                 self.service = Yedit(content=result['results'][0])
 
-        return (self.deploymentconfig, self.service)
+            if result['returncode'] != 0:
+                rval = result['returncode']
+
+
+        return {'returncode': rval, 'deploymentconfig': self.deploymentconfig, 'service': self.service}
 
     def exists(self):
         '''does the object exist?'''
@@ -132,9 +137,16 @@ class Registry(OpenShiftCLI):
                 continue
             parts.append(self._delete(part['kind'], part['name']))
 
-        return parts
+        # Clean up returned results
+        rval = 0
+        for part in parts:
+            # pylint: disable=invalid-sequence-index
+            if 'returncode' in part and part['returncode'] != 0:
+                rval = part['returncode']
+
+        return {'returncode': rval, 'results': parts}
 
-    def _prepare_registry(self):
+    def prepare_registry(self):
         ''' prepare a registry for instantiation '''
         options = self.config.to_option_list()
 
@@ -191,10 +203,10 @@ class Registry(OpenShiftCLI):
         # Clean up returned results
         rval = 0
         for result in results:
-            if result['returncode'] != 0:
+            # pylint: disable=invalid-sequence-index
+            if 'returncode' in result and result['returncode'] != 0:
                 rval = result['returncode']
 
-
         return {'returncode': rval, 'results': results}
 
     def update(self):
@@ -311,6 +323,8 @@ class Registry(OpenShiftCLI):
 
         return self.prepared_registry['deployment_update'] or self.prepared_registry['service_update'] or False
 
+    # In the future, we would like to break out each ansible state into a function.
+    # pylint: disable=too-many-branches,too-many-return-statements
     @staticmethod
     def run_ansible(params, check_mode):
         '''run idempotent ansible code'''
@@ -360,6 +374,8 @@ class Registry(OpenShiftCLI):
             if check_mode:
                 return {'changed': True, 'msg': 'CHECK_MODE: Would have performed a delete.'}
 
+            # Unsure as to why this is angry with the return type.
+            # pylint: disable=redefined-variable-type
             api_rval = ocregistry.delete()
 
             if api_rval['returncode'] != 0: