Merge pull request #5575 from ewolinetz/bz1470623

Registering the broker for TSB

files/origin-components/template-service-broker-registration.yaml

@@ -0,0 +1,25 @@
+apiVersion: template.openshift.io/v1
+kind: Template
+metadata:
+  name: template-service-broker-registration
+parameters:
+- name: TSB_NAMESPACE
+  value: openshift-template-service-broker
+- name: CA_BUNDLE
+  required: true
+objects:
+# register the tsb with the service catalog
+- apiVersion: servicecatalog.k8s.io/v1alpha1
+  kind: ServiceBroker
+  metadata:
+    name: template-service-broker
+  spec:
+    url: https://apiserver.${TSB_NAMESPACE}.svc:443/brokers/template.openshift.io
+    insecureSkipTLSVerify: false
+    caBundle: ${CA_BUNDLE}
+    authInfo:
+      bearer:
+        secretRef:
+          kind:      Secret
+          name:      templateservicebroker-client
+          namespace: ${TSB_NAMESPACE}

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 }}"

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:

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"