Merge pull request #6020 from sdodson/asb-tsb

Remove duplicate defaulting for ASB and TSB

roles/ansible_service_broker/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 
 ansible_service_broker_remove: false
-ansible_service_broker_install: false
+ansible_service_broker_install: true
 ansible_service_broker_log_level: info
 ansible_service_broker_output_request: false
 ansible_service_broker_recovery: true

roles/ansible_service_broker/tasks/main.yml

@@ -2,7 +2,7 @@
 # do any asserts here
 
 - include: install.yml
-  when: ansible_service_broker_install | default(true) | bool
+  when: ansible_service_broker_install | bool
 
 - include: remove.yml
-  when: ansible_service_broker_remove | default(false) | bool
+  when: ansible_service_broker_remove | bool

roles/template_service_broker/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
 # placeholder file?
 template_service_broker_remove: False
-template_service_broker_install: False
+template_service_broker_install: True
 openshift_template_service_broker_namespaces: ['openshift']

roles/template_service_broker/tasks/install.yml

@@ -42,7 +42,7 @@
 
 - name: Apply template file
   shell: >
-    oc process -f "{{ mktemp.stdout }}/{{ __tsb_template_file }}"
+    {{ openshift.common.client_binary }} process -f "{{ mktemp.stdout }}/{{ __tsb_template_file }}"
     --param API_SERVER_CONFIG="{{ config['content'] | b64decode }}"
     --param IMAGE="{{ template_service_broker_prefix }}{{ template_service_broker_image_name }}:{{ template_service_broker_version }}"
     | {{ openshift.common.client_binary }} apply -f -
@@ -50,7 +50,7 @@
 # reconcile with rbac
 - name: Reconcile with RBAC file
   shell: >
-    oc process -f "{{ mktemp.stdout }}/{{ __tsb_rbac_file }}" | oc auth reconcile -f -
+    {{ openshift.common.client_binary }} process -f "{{ mktemp.stdout }}/{{ __tsb_rbac_file }}" | {{ openshift.common.client_binary }} auth reconcile -f -
 
 - name: copy tech preview extension file for service console UI
   copy:
@@ -82,7 +82,7 @@
 # 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 -
+    {{ openshift.common.client_binary }} process -f "{{ mktemp.stdout }}/{{ __tsb_broker_file }}" --param CA_BUNDLE="{{ __ca_bundle.content }}" | {{ openshift.common.client_binary }} apply -f -
 
 - file:
     state: absent

roles/template_service_broker/tasks/main.yml

@@ -2,7 +2,7 @@
 # do any asserts here
 
 - include: install.yml
-  when: template_service_broker_install | default(true) | bool
+  when: template_service_broker_install | bool
 
 - include: remove.yml
-  when: template_service_broker_remove | default(false) | bool
+  when: template_service_broker_remove | bool

roles/template_service_broker/tasks/remove.yml

@@ -13,11 +13,11 @@
 
 - name: Delete TSB broker
   shell: >
-    oc process -f "{{ mktemp.stdout }}/{{ __tsb_broker_file }}" | oc delete --ignore-not-found -f -
+    {{ openshift.common.client_binary }} process -f "{{ mktemp.stdout }}/{{ __tsb_broker_file }}" | {{ openshift.common.client_binary }} delete --ignore-not-found -f -
 
 - name: Delete TSB objects
   shell: >
-    oc process -f "{{ mktemp.stdout }}/{{ __tsb_template_file }}" | oc delete --ignore-not-found -f -
+    {{ openshift.common.client_binary }} process -f "{{ mktemp.stdout }}/{{ __tsb_template_file }}" | {{ openshift.common.client_binary }} delete --ignore-not-found -f -
 
 - name: empty out tech preview extension file for service console UI
   copy: