diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-01 11:26:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-01 11:26:20 -0500 |
| commit | e0e10698184c9a7cf4bf65787771686e46d26603 (patch) | |
| tree | 3409b77db85bddaa0df2fa9e00c2f02eddc314ad /roles/lib_openshift/library/oc_adm_router.py | |
| parent | 934b203627f0d9af42f8fa3f5d51b03ba361859c (diff) | |
| parent | 4f72e8a10da24aa231498c897db1153ef51ba2ee (diff) | |
| download | openshift-e0e10698184c9a7cf4bf65787771686e46d26603.tar.gz openshift-e0e10698184c9a7cf4bf65787771686e46d26603.tar.bz2 openshift-e0e10698184c9a7cf4bf65787771686e46d26603.tar.xz openshift-e0e10698184c9a7cf4bf65787771686e46d26603.zip | |
Merge pull request #6277 from fabianvf/asb-idempotence-cpick
Bug 1512793- Fix idempotence issues in ASB deploy
Diffstat (limited to 'roles/lib_openshift/library/oc_adm_router.py')
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_router.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/lib_openshift/library/oc_adm_router.py b/roles/lib_openshift/library/oc_adm_router.py index 5969da7ca..44de29592 100644 --- a/roles/lib_openshift/library/oc_adm_router.py +++ b/roles/lib_openshift/library/oc_adm_router.py @@ -1559,6 +1559,7 @@ class ServiceConfig(object): sname, namespace, ports, + annotations=None, selector=None, labels=None, cluster_ip=None, @@ -1570,6 +1571,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 @@ -1592,6 +1594,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: |