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/lib | |
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/lib')
-rw-r--r-- | roles/lib_openshift/src/lib/service.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/lib_openshift/src/lib/service.py b/roles/lib_openshift/src/lib/service.py index 0e8cc3aa5..84620c518 100644 --- a/roles/lib_openshift/src/lib/service.py +++ b/roles/lib_openshift/src/lib/service.py @@ -10,6 +10,7 @@ class ServiceConfig(object): sname, namespace, ports, + annotations=None, selector=None, labels=None, cluster_ip=None, @@ -21,6 +22,7 @@ class ServiceConfig(object): self.name = sname self.namespace = namespace self.ports = ports + self.annotations = annotations self.selector = selector self.labels = labels self.cluster_ip = cluster_ip @@ -43,6 +45,9 @@ class ServiceConfig(object): self.data['metadata']['labels'] = {} for lab, lab_value in self.labels.items(): self.data['metadata']['labels'][lab] = lab_value + if self.annotations: + self.data['metadata']['annotations'] = self.annotations + self.data['spec'] = {} if self.ports: |