summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/library/oc_adm_router.py
diff options
context:
space:
mode:
authorFabian von Feilitzsch <fabian@fabianism.us>2017-08-29 15:41:36 -0400
committerFabian von Feilitzsch <fabian@fabianism.us>2017-10-02 16:21:17 -0400
commit7d8d21b7a5170fa3b187d7afe6d010a2e888fe74 (patch)
tree1a88b298ac87077c56a1c86bbfb13af6b87447f6 /roles/lib_openshift/library/oc_adm_router.py
parente3d5519c6d68b9aa162a58e1a897b6e4f6b0eea1 (diff)
downloadopenshift-7d8d21b7a5170fa3b187d7afe6d010a2e888fe74.tar.gz
openshift-7d8d21b7a5170fa3b187d7afe6d010a2e888fe74.tar.bz2
openshift-7d8d21b7a5170fa3b187d7afe6d010a2e888fe74.tar.xz
openshift-7d8d21b7a5170fa3b187d7afe6d010a2e888fe74.zip
Update ansible-service-broker config to track latest broker
bring ansible service broker up to date with bearer token changes etcd -> 0.0.0.0 add auth information to broker resource in catalog add sandbox role to config simplify defaults add labels to oc_route use new oc_route label field Fix parameter ordering add port back Fix secret syntax
Diffstat (limited to 'roles/lib_openshift/library/oc_adm_router.py')
-rw-r--r--roles/lib_openshift/library/oc_adm_router.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/roles/lib_openshift/library/oc_adm_router.py b/roles/lib_openshift/library/oc_adm_router.py
index 492494bda..7bbce2e54 100644
--- a/roles/lib_openshift/library/oc_adm_router.py
+++ b/roles/lib_openshift/library/oc_adm_router.py
@@ -2230,13 +2230,15 @@ class SecretConfig(object):
namespace,
kubeconfig,
secrets=None,
- stype=None):
+ stype=None,
+ annotations=None):
''' constructor for handling secret options '''
self.kubeconfig = kubeconfig
self.name = sname
self.type = stype
self.namespace = namespace
self.secrets = secrets
+ self.annotations = annotations
self.data = {}
self.create_dict()
@@ -2253,6 +2255,8 @@ class SecretConfig(object):
if self.secrets:
for key, value in self.secrets.items():
self.data['data'][key] = value
+ if self.annotations:
+ self.data['metadata']['annotations'] = self.annotations
# pylint: disable=too-many-instance-attributes
class Secret(Yedit):