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/ansible_service_broker/vars | |
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/ansible_service_broker/vars')
-rw-r--r-- | roles/ansible_service_broker/vars/default_images.yml | 1 | ||||
-rw-r--r-- | roles/ansible_service_broker/vars/openshift-enterprise.yml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/roles/ansible_service_broker/vars/default_images.yml b/roles/ansible_service_broker/vars/default_images.yml index 15e448515..3e9639adf 100644 --- a/roles/ansible_service_broker/vars/default_images.yml +++ b/roles/ansible_service_broker/vars/default_images.yml @@ -8,6 +8,7 @@ __ansible_service_broker_etcd_image_tag: latest __ansible_service_broker_etcd_image_etcd_path: /usr/local/bin/etcd __ansible_service_broker_registry_type: dockerhub +__ansible_service_broker_registry_name: dh __ansible_service_broker_registry_url: null __ansible_service_broker_registry_user: null __ansible_service_broker_registry_password: null diff --git a/roles/ansible_service_broker/vars/openshift-enterprise.yml b/roles/ansible_service_broker/vars/openshift-enterprise.yml index ce2ae8365..9c576cb76 100644 --- a/roles/ansible_service_broker/vars/openshift-enterprise.yml +++ b/roles/ansible_service_broker/vars/openshift-enterprise.yml @@ -7,7 +7,9 @@ __ansible_service_broker_etcd_image_prefix: rhel7/ __ansible_service_broker_etcd_image_tag: latest __ansible_service_broker_etcd_image_etcd_path: /bin/etcd + __ansible_service_broker_registry_type: rhcc +__ansible_service_broker_registry_name: rh __ansible_service_broker_registry_url: "https://registry.access.redhat.com" __ansible_service_broker_registry_user: null __ansible_service_broker_registry_password: null |