Merge pull request #3467 from kwoodson/registry_updates

Fixed default variables.  Added a fix to generated secret in env var.

1 files changed, 8 insertions, 0 deletions

diff --git a/roles/lib_openshift/src/class/oc_adm_registry.py b/roles/lib_openshift/src/class/oc_adm_registry.py
index eb78667ca..35b417059 100644
--- a/roles/lib_openshift/src/class/oc_adm_registry.py
+++ b/roles/lib_openshift/src/class/oc_adm_registry.py
@@ -232,6 +232,14 @@ class Registry(OpenShiftCLI):
 
     def add_modifications(self, deploymentconfig):
         ''' update a deployment config with changes '''
+        # The environment variable for REGISTRY_HTTP_SECRET is autogenerated
+        # We should set the generated deploymentconfig to the in memory version
+        # the following modifications will overwrite if needed
+        if self.deploymentconfig:
+            result = self.deploymentconfig.get_env_var('REGISTRY_HTTP_SECRET')
+            if result:
+                deploymentconfig.update_env_var('REGISTRY_HTTP_SECRET', result['value'])
+
         # Currently we know that our deployment of a registry requires a few extra modifications
         # Modification 1
         # we need specific environment variables to be set