summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/src/class/oc_adm_registry.py
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-02-23 11:34:05 -0500
committerKenny Woodson <kwoodson@redhat.com>2017-02-24 13:28:38 -0500
commit315657e7befc62502e446dd889f96cfa4c0f5458 (patch)
tree225dcba1d60e0a144700a84d033ae637f5c90769 /roles/lib_openshift/src/class/oc_adm_registry.py
parentc2528f6ecda7e8f6ef5ffdccecd3f3532f2af03f (diff)
downloadopenshift-315657e7befc62502e446dd889f96cfa4c0f5458.tar.gz
openshift-315657e7befc62502e446dd889f96cfa4c0f5458.tar.bz2
openshift-315657e7befc62502e446dd889f96cfa4c0f5458.tar.xz
openshift-315657e7befc62502e446dd889f96cfa4c0f5458.zip
Fixed default variables. Added a fix to generated secret in env var.
Diffstat (limited to 'roles/lib_openshift/src/class/oc_adm_registry.py')
-rw-r--r--roles/lib_openshift/src/class/oc_adm_registry.py7
1 files changed, 7 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..069d58d9b 100644
--- a/roles/lib_openshift/src/class/oc_adm_registry.py
+++ b/roles/lib_openshift/src/class/oc_adm_registry.py
@@ -232,6 +232,13 @@ 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
+ 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