diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-03 10:54:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 10:54:44 -0700 |
| commit | 6d8a25425e0b011ac5bd6c54dca2a61f56e356c6 (patch) | |
| tree | f9fed6c76d1d7189087ba06871ca678a137cf3a8 /roles/openshift_service_catalog/tasks/remove.yml | |
| parent | adb5c51666dfe7c6b93c7bd7c87b339ef2a27f5b (diff) | |
| parent | 324778ac48522847280ac898553235f65e84ad6a (diff) | |
| download | openshift-6d8a25425e0b011ac5bd6c54dca2a61f56e356c6.tar.gz openshift-6d8a25425e0b011ac5bd6c54dca2a61f56e356c6.tar.bz2 openshift-6d8a25425e0b011ac5bd6c54dca2a61f56e356c6.tar.xz openshift-6d8a25425e0b011ac5bd6c54dca2a61f56e356c6.zip | |
Merge pull request #5959 from sdodson/sc-asb-tsb-on-by-default
Automatic merge from submit-queue.
Enable SC, ASB, TSB by default
It was decided that SC, ASB, and TSB should be installed by default.
This will not install the components on an upgrade from 3.6 to 3.7, that will require that you run the sc playbook on your own.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1508085
Diffstat (limited to 'roles/openshift_service_catalog/tasks/remove.yml')
| -rw-r--r-- | roles/openshift_service_catalog/tasks/remove.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_service_catalog/tasks/remove.yml b/roles/openshift_service_catalog/tasks/remove.yml index ca9844e79..a832e1f85 100644 --- a/roles/openshift_service_catalog/tasks/remove.yml +++ b/roles/openshift_service_catalog/tasks/remove.yml @@ -1,7 +1,7 @@ --- - name: Remove Service Catalog APIServer command: > - oc delete apiservices.apiregistration.k8s.io/v1beta1.servicecatalog.k8s.io --ignore-not-found -n kube-service-catalog + {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig delete apiservices.apiregistration.k8s.io/v1beta1.servicecatalog.k8s.io --ignore-not-found -n kube-service-catalog # TODO: this module doesn't currently remove this #- name: Remove service catalog api service @@ -48,7 +48,7 @@ - name: Remove Service Catalog kube-system Role Bindinds shell: > - oc process kube-system-service-catalog-role-bindings -n kube-system | oc delete --ignore-not-found -f - + {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig process kube-system-service-catalog-role-bindings -n kube-system | {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig delete --ignore-not-found -f - - oc_obj: kind: template @@ -58,7 +58,7 @@ - name: Remove Service Catalog kube-service-catalog Role Bindinds shell: > - oc process service-catalog-role-bindings -n kube-service-catalog | oc delete --ignore-not-found -f - + {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig process service-catalog-role-bindings -n kube-service-catalog | {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig delete --ignore-not-found -f - - oc_obj: kind: template |