diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-03-07 16:39:52 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-03-07 16:39:52 -0500 |
| commit | e2bad8efff2aaee4906575bc523c57bffa924715 (patch) | |
| tree | 56905b6f8d7b3dbaf2e122940885aab0b97eb94a /roles/lib_openshift/src/class/oc_adm_registry.py | |
| parent | de554f408404502319f8bccc8e51f8ab3e7b2ed6 (diff) | |
| download | openshift-e2bad8efff2aaee4906575bc523c57bffa924715.tar.gz openshift-e2bad8efff2aaee4906575bc523c57bffa924715.tar.bz2 openshift-e2bad8efff2aaee4906575bc523c57bffa924715.tar.xz openshift-e2bad8efff2aaee4906575bc523c57bffa924715.zip | |
Fix to OpenshiftCLIConfig to support an ordereddict. This was breaking test cases.
Diffstat (limited to 'roles/lib_openshift/src/class/oc_adm_registry.py')
| -rw-r--r-- | roles/lib_openshift/src/class/oc_adm_registry.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_openshift/src/class/oc_adm_registry.py b/roles/lib_openshift/src/class/oc_adm_registry.py index 37904c43f..a9911966b 100644 --- a/roles/lib_openshift/src/class/oc_adm_registry.py +++ b/roles/lib_openshift/src/class/oc_adm_registry.py @@ -119,7 +119,6 @@ class Registry(OpenShiftCLI): def exists(self): '''does the object exist?''' - self.get() if self.deploymentconfig and self.service: return True @@ -180,7 +179,8 @@ class Registry(OpenShiftCLI): service.put('spec.portalIP', self.portal_ip) # the dry-run doesn't apply the selector correctly - service.put('spec.selector', self.service.get_selector()) + if self.service: + service.put('spec.selector', self.service.get_selector()) # need to create the service and the deploymentconfig service_file = Utils.create_tmp_file_from_contents('service', service.yaml_dict) |