diff options
| author | Fabian von Feilitzsch <fabian@fabianism.us> | 2017-11-20 11:34:23 -0500 |
|---|---|---|
| committer | Fabian von Feilitzsch <fabian@fabianism.us> | 2017-11-28 13:44:07 -0500 |
| commit | 4f72e8a10da24aa231498c897db1153ef51ba2ee (patch) | |
| tree | 14a8da11ac81e548d76086434aa2a2521cf52550 /roles/lib_openshift/src/class | |
| parent | e7e699a4201754fe9ccd1b9adffad5be5fff18b3 (diff) | |
| download | openshift-4f72e8a10da24aa231498c897db1153ef51ba2ee.tar.gz openshift-4f72e8a10da24aa231498c897db1153ef51ba2ee.tar.bz2 openshift-4f72e8a10da24aa231498c897db1153ef51ba2ee.tar.xz openshift-4f72e8a10da24aa231498c897db1153ef51ba2ee.zip | |
Bug 1512793- Fix idempotence issues in ASB deploy
- Add support for annotations in oc_service
- Use oc_service instead of oc_obj
- Use oc_pvc instead of oc_obj
- Work around lack of idempotency for oc_obj DeploymentConfig
Diffstat (limited to 'roles/lib_openshift/src/class')
| -rw-r--r-- | roles/lib_openshift/src/class/oc_service.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/lib_openshift/src/class/oc_service.py b/roles/lib_openshift/src/class/oc_service.py index 7268a0c88..e41237b7e 100644 --- a/roles/lib_openshift/src/class/oc_service.py +++ b/roles/lib_openshift/src/class/oc_service.py @@ -13,6 +13,7 @@ class OCService(OpenShiftCLI): sname, namespace, labels, + annotations, selector, cluster_ip, portal_ip, @@ -25,7 +26,7 @@ class OCService(OpenShiftCLI): ''' Constructor for OCVolume ''' super(OCService, self).__init__(namespace, kubeconfig, verbose) self.namespace = namespace - self.config = ServiceConfig(sname, namespace, ports, selector, labels, + self.config = ServiceConfig(sname, namespace, ports, annotations, selector, labels, cluster_ip, portal_ip, session_affinity, service_type, external_ips) self.user_svc = Service(content=self.config.data) @@ -90,6 +91,7 @@ class OCService(OpenShiftCLI): oc_svc = OCService(params['name'], params['namespace'], params['labels'], + params['annotations'], params['selector'], params['clusterip'], params['portalip'], |