diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-08 13:51:40 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-11-08 14:38:19 -0500 |
| commit | ad977b701124f5e134e8c2a0cbc6e907ce177366 (patch) | |
| tree | 3f65ff31a6af6d4479b03e22ab657f58c235b947 | |
| parent | 26a6ddc4fb1be4c8018c5e1f0e8260c9a02ddf24 (diff) | |
| download | openshift-ad977b701124f5e134e8c2a0cbc6e907ce177366.tar.gz openshift-ad977b701124f5e134e8c2a0cbc6e907ce177366.tar.bz2 openshift-ad977b701124f5e134e8c2a0cbc6e907ce177366.tar.xz openshift-ad977b701124f5e134e8c2a0cbc6e907ce177366.zip | |
Use openshift.common.client_binary
| -rw-r--r-- | roles/template_service_broker/tasks/install.yml | 6 | ||||
| -rw-r--r-- | roles/template_service_broker/tasks/remove.yml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/template_service_broker/tasks/install.yml b/roles/template_service_broker/tasks/install.yml index a78e4825b..0db9e642a 100644 --- a/roles/template_service_broker/tasks/install.yml +++ b/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 diff --git a/roles/template_service_broker/tasks/remove.yml b/roles/template_service_broker/tasks/remove.yml index 28836f97f..8b5593ff9 100644 --- a/roles/template_service_broker/tasks/remove.yml +++ b/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: |