diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2017-02-27 19:01:32 -0500 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2017-02-28 09:29:21 -0500 |
commit | 74e890482f2be933634286f8b4cf488287cf6d39 (patch) | |
tree | 26ace727f85fa25e6629f3cf10c4f2c1d05f80b4 /roles/lib_openshift/library/oc_adm_registry.py | |
parent | e0090381732d43de74715b9d41480b3c43391783 (diff) | |
download | openshift-74e890482f2be933634286f8b4cf488287cf6d39.tar.gz openshift-74e890482f2be933634286f8b4cf488287cf6d39.tar.bz2 openshift-74e890482f2be933634286f8b4cf488287cf6d39.tar.xz openshift-74e890482f2be933634286f8b4cf488287cf6d39.zip |
Modified base debug statements. Fixed oc_secret debug/verbose flag. Added reencrypt for route.
Diffstat (limited to 'roles/lib_openshift/library/oc_adm_registry.py')
-rw-r--r-- | roles/lib_openshift/library/oc_adm_registry.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/roles/lib_openshift/library/oc_adm_registry.py b/roles/lib_openshift/library/oc_adm_registry.py index e404f0e0e..a2c4515aa 100644 --- a/roles/lib_openshift/library/oc_adm_registry.py +++ b/roles/lib_openshift/library/oc_adm_registry.py @@ -1387,8 +1387,8 @@ class Utils(object): elif value != user_def[key]: if debug: print('value should be identical') - print(value) print(user_def[key]) + print(value) return False # recurse on a dictionary @@ -1408,8 +1408,8 @@ class Utils(object): if api_values != user_values: if debug: print("keys are not equal in dict") - print(api_values) print(user_values) + print(api_values) return False result = Utils.check_def_equal(user_def[key], value, skip_keys=skip_keys, debug=debug) @@ -1985,6 +1985,7 @@ class Service(Yedit): port_path = "spec.ports" portal_ip = "spec.portalIP" cluster_ip = "spec.clusterIP" + selector_path = 'spec.selector' kind = 'Service' def __init__(self, content): @@ -1995,6 +1996,10 @@ class Service(Yedit): ''' get a list of ports ''' return self.get(Service.port_path) or [] + def get_selector(self): + ''' get the service selector''' + return self.get(Service.selector_path) or {} + def add_ports(self, inc_ports): ''' add a port object to the ports list ''' if not isinstance(inc_ports, list): @@ -2243,7 +2248,7 @@ class Registry(OpenShiftCLI): if result['returncode'] == 0 and part['kind'] == 'dc': self.deploymentconfig = DeploymentConfig(result['results'][0]) elif result['returncode'] == 0 and part['kind'] == 'svc': - self.service = Yedit(content=result['results'][0]) + self.service = Service(result['results'][0]) if result['returncode'] != 0: rval = result['returncode'] @@ -2313,6 +2318,9 @@ class Registry(OpenShiftCLI): if self.portal_ip: service.put('spec.portalIP', self.portal_ip) + # the dry-run doesn't apply the selector correctly + 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) deployment_file = Utils.create_tmp_file_from_contents('deploymentconfig', deploymentconfig.yaml_dict) |