diff options
| author | Fabian von Feilitzsch <fabian@fabianism.us> | 2017-08-29 15:41:36 -0400 |
|---|---|---|
| committer | Fabian von Feilitzsch <fabian@fabianism.us> | 2017-10-02 16:21:17 -0400 |
| commit | 7d8d21b7a5170fa3b187d7afe6d010a2e888fe74 (patch) | |
| tree | 1a88b298ac87077c56a1c86bbfb13af6b87447f6 /roles/lib_openshift/src/lib | |
| parent | e3d5519c6d68b9aa162a58e1a897b6e4f6b0eea1 (diff) | |
| download | openshift-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/src/lib')
| -rw-r--r-- | roles/lib_openshift/src/lib/route.py | 4 | ||||
| -rw-r--r-- | roles/lib_openshift/src/lib/secret.py | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/roles/lib_openshift/src/lib/route.py b/roles/lib_openshift/src/lib/route.py index 3b54a24fb..b106866cb 100644 --- a/roles/lib_openshift/src/lib/route.py +++ b/roles/lib_openshift/src/lib/route.py @@ -11,6 +11,7 @@ class RouteConfig(object): sname, namespace, kubeconfig, + labels=None, destcacert=None, cacert=None, cert=None, @@ -25,6 +26,7 @@ class RouteConfig(object): self.kubeconfig = kubeconfig self.name = sname self.namespace = namespace + self.labels = labels self.host = host self.tls_termination = tls_termination self.destcacert = destcacert @@ -50,6 +52,8 @@ class RouteConfig(object): self.data['metadata'] = {} self.data['metadata']['name'] = self.name self.data['metadata']['namespace'] = self.namespace + if self.labels: + self.data['metadata']['labels'] = self.labels self.data['spec'] = {} self.data['spec']['host'] = self.host diff --git a/roles/lib_openshift/src/lib/secret.py b/roles/lib_openshift/src/lib/secret.py index a1c202442..ad4b6aa36 100644 --- a/roles/lib_openshift/src/lib/secret.py +++ b/roles/lib_openshift/src/lib/secret.py @@ -10,13 +10,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() @@ -33,6 +35,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): |