diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-19 10:09:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 10:09:31 -0400 |
| commit | 8d527636729612c0b5fc80ad7e07ed2eae7ad561 (patch) | |
| tree | a99f914ce8e450ea2e541aefab5bc071a15a5f1a /roles/ansible_service_broker/tasks/install.yml | |
| parent | 61cca52ea383d75aa4c20cf0e96936a5188084e9 (diff) | |
| parent | dc89e0fa2b3e5fa10027e93a1124ed6eeacad021 (diff) | |
| download | openshift-8d527636729612c0b5fc80ad7e07ed2eae7ad561.tar.gz openshift-8d527636729612c0b5fc80ad7e07ed2eae7ad561.tar.bz2 openshift-8d527636729612c0b5fc80ad7e07ed2eae7ad561.tar.xz openshift-8d527636729612c0b5fc80ad7e07ed2eae7ad561.zip | |
Merge pull request #5746 from staebler/Bug_1496694_new_resource_names
Update service catalog playbook for service-catalog rc1
Diffstat (limited to 'roles/ansible_service_broker/tasks/install.yml')
| -rw-r--r-- | roles/ansible_service_broker/tasks/install.yml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml index 0f4b71124..c0384b7c4 100644 --- a/roles/ansible_service_broker/tasks/install.yml +++ b/roles/ansible_service_broker/tasks/install.yml @@ -30,8 +30,12 @@ ansible_service_broker_image: "{{ ansible_service_broker_image_prefix }}ansible-service-broker:{{ ansible_service_broker_image_tag }}" ansible_service_broker_etcd_image: "{{ ansible_service_broker_etcd_image_prefix }}etcd:{{ ansible_service_broker_etcd_image_tag }}" +- set_fact: + openshift_master_config_dir: "{{ openshift.common.config_base }}/master" + when: openshift_master_config_dir is undefined + - slurp: - src: "{{ ansible_service_broker_certs_dir }}/ca.crt" + src: "{{ openshift_master_config_dir }}/service-signer.crt" register: catalog_ca @@ -327,12 +331,12 @@ oc_obj: name: ansible-service-broker state: present - kind: ServiceBroker + kind: ClusterServiceBroker content: path: /tmp/brokerout data: - apiVersion: servicecatalog.k8s.io/v1alpha1 - kind: ServiceBroker + apiVersion: servicecatalog.k8s.io/v1beta1 + kind: ClusterServiceBroker metadata: name: ansible-service-broker spec: |