diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-09-29 16:57:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 16:57:18 -0400 |
| commit | 1cd0a0c1165a4f274b30d7570f2e3ab2009e0046 (patch) | |
| tree | e669d78f162ea0679682d4cfb5bef67869d2dfc8 /roles | |
| parent | 4c7d5c40c2820f83ad10eeb30b7b4cc07c0ef700 (diff) | |
| parent | 849463887be01dfa9945dca96384510481058b0f (diff) | |
| download | openshift-1cd0a0c1165a4f274b30d7570f2e3ab2009e0046.tar.gz openshift-1cd0a0c1165a4f274b30d7570f2e3ab2009e0046.tar.bz2 openshift-1cd0a0c1165a4f274b30d7570f2e3ab2009e0046.tar.xz openshift-1cd0a0c1165a4f274b30d7570f2e3ab2009e0046.zip | |
Merge pull request #5575 from ewolinetz/bz1470623
Registering the broker for TSB
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/template_service_broker/tasks/install.yml | 28 | ||||
| -rw-r--r-- | roles/template_service_broker/tasks/remove.yml | 11 | ||||
| -rw-r--r-- | roles/template_service_broker/vars/main.yml | 1 |
3 files changed, 38 insertions, 2 deletions
diff --git a/roles/template_service_broker/tasks/install.yml b/roles/template_service_broker/tasks/install.yml index a9d22aa06..f5fd6487c 100644 --- a/roles/template_service_broker/tasks/install.yml +++ b/roles/template_service_broker/tasks/install.yml @@ -27,6 +27,7 @@ with_items: - "{{ __tsb_template_file }}" - "{{ __tsb_rbac_file }}" + - "{{ __tsb_broker_file }}" - name: Apply template file shell: > @@ -42,6 +43,33 @@ src: openshift-ansible-catalog-console.js dest: /etc/origin/master/openshift-ansible-catalog-console.js +# Check that the TSB is running +- name: Verify that TSB is running + command: > + curl -k https://apiserver.openshift-template-service-broker.svc/healthz + args: + # Disables the following warning: + # Consider using get_url or uri module rather than running curl + warn: no + register: api_health + until: api_health.stdout == 'ok' + retries: 120 + delay: 1 + changed_when: false + +- set_fact: + openshift_master_config_dir: "{{ openshift.common.config_base }}/master" + when: openshift_master_config_dir is undefined + +- slurp: + src: "{{ openshift_master_config_dir }}/ca.crt" + register: __ca_bundle + +# Register with broker +- name: Register TSB with broker + shell: > + oc process -f "{{ mktemp.stdout }}/{{ __tsb_broker_file }}" --param CA_BUNDLE="{{ __ca_bundle.content }}" | oc apply -f - + - file: state: absent name: "{{ mktemp.stdout }}" diff --git a/roles/template_service_broker/tasks/remove.yml b/roles/template_service_broker/tasks/remove.yml index 207dd9bdb..f3afe65ed 100644 --- a/roles/template_service_broker/tasks/remove.yml +++ b/roles/template_service_broker/tasks/remove.yml @@ -6,11 +6,18 @@ - copy: src: "{{ __tsb_files_location }}/{{ item }}" - dest: "{{ mktemp.stdout }}/{{ __tsb_template_file }}" + dest: "{{ mktemp.stdout }}/{{ item }}" + with_items: + - "{{ __tsb_template_file }}" + - "{{ __tsb_broker_file }}" + +- name: Delete TSB broker + shell: > + oc process -f "{{ mktemp.stdout }}/{{ __tsb_broker_file }}" | oc delete -f - - name: Delete TSB objects shell: > - oc process -f "{{ __tsb_files_location }}/{{ __tsb_template_file }}" | kubectl delete -f - + oc process -f "{{ mktemp.stdout }}/{{ __tsb_template_file }}" | kubectl delete -f - - name: empty out tech preview extension file for service console UI copy: diff --git a/roles/template_service_broker/vars/main.yml b/roles/template_service_broker/vars/main.yml index 372ab8f6f..a65340f16 100644 --- a/roles/template_service_broker/vars/main.yml +++ b/roles/template_service_broker/vars/main.yml @@ -4,3 +4,4 @@ __tsb_files_location: "../../../files/origin-components/" __tsb_template_file: "apiserver-template.yaml" __tsb_config_file: "apiserver-config.yaml" __tsb_rbac_file: "rbac-template.yaml" +__tsb_broker_file: "template-service-broker-registration.yaml" |