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/src/class | |
| 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/src/class')
| -rw-r--r-- | roles/lib_openshift/src/class/oc_adm_registry.py | 5 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_route.py | 2 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_service.py | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/roles/lib_openshift/src/class/oc_adm_registry.py b/roles/lib_openshift/src/class/oc_adm_registry.py index 35b417059..06de2ba12 100644 --- a/roles/lib_openshift/src/class/oc_adm_registry.py +++ b/roles/lib_openshift/src/class/oc_adm_registry.py @@ -109,7 +109,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'] @@ -179,6 +179,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) diff --git a/roles/lib_openshift/src/class/oc_route.py b/roles/lib_openshift/src/class/oc_route.py index 122cc5fe9..33ffdcb66 100644 --- a/roles/lib_openshift/src/class/oc_route.py +++ b/roles/lib_openshift/src/class/oc_route.py @@ -56,7 +56,7 @@ class OCRoute(OpenShiftCLI): def update(self): '''update the object''' # when the host attribute is being updated, we need to delete and recreate - if self.config.host != self.route.host: + if self.config.host != self.route.get_host(): import time self.delete() time.sleep(3) diff --git a/roles/lib_openshift/src/class/oc_service.py b/roles/lib_openshift/src/class/oc_service.py index d4cc83a59..20cf23df5 100644 --- a/roles/lib_openshift/src/class/oc_service.py +++ b/roles/lib_openshift/src/class/oc_service.py @@ -22,7 +22,7 @@ class OCService(OpenShiftCLI): kubeconfig='/etc/origin/master/admin.kubeconfig', verbose=False): ''' Constructor for OCVolume ''' - super(OCService, self).__init__(namespace, kubeconfig) + super(OCService, self).__init__(namespace, kubeconfig, verbose) self.namespace = namespace self.config = ServiceConfig(sname, namespace, ports, selector, labels, cluster_ip, portal_ip, session_affinity, service_type) @@ -93,7 +93,9 @@ class OCService(OpenShiftCLI): params['portalip'], params['ports'], params['session_affinity'], - params['service_type']) + params['service_type'], + params['kubeconfig'], + params['debug']) state = params['state'] |