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/class | |
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/class')
-rw-r--r-- | roles/lib_openshift/src/class/oc_route.py | 1 | ||||
-rw-r--r-- | roles/lib_openshift/src/class/oc_secret.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_openshift/src/class/oc_route.py b/roles/lib_openshift/src/class/oc_route.py index 3a1bd732f..dc2f7977b 100644 --- a/roles/lib_openshift/src/class/oc_route.py +++ b/roles/lib_openshift/src/class/oc_route.py @@ -118,6 +118,7 @@ class OCRoute(OpenShiftCLI): rconfig = RouteConfig(params['name'], params['namespace'], params['kubeconfig'], + params['labels'], files['destcacert']['value'], files['cacert']['value'], files['cert']['value'], diff --git a/roles/lib_openshift/src/class/oc_secret.py b/roles/lib_openshift/src/class/oc_secret.py index 4ee6443e9..5322d6241 100644 --- a/roles/lib_openshift/src/class/oc_secret.py +++ b/roles/lib_openshift/src/class/oc_secret.py @@ -142,8 +142,7 @@ class OCSecret(OpenShiftCLI): elif params['contents']: files = Utils.create_tmp_files_from_contents(params['contents']) else: - return {'failed': True, - 'msg': 'Either specify files or contents.'} + files = [{'name': 'null', 'path': os.devnull}] ######## # Create |