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/install.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/install.yml')
| -rw-r--r-- | roles/openshift_service_catalog/tasks/install.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml index 0641483cd..3507330e3 100644 --- a/roles/openshift_service_catalog/tasks/install.yml +++ b/roles/openshift_service_catalog/tasks/install.yml @@ -38,7 +38,7 @@ - name: Make kube-service-catalog project network global command: > - oc adm pod-network make-projects-global kube-service-catalog + {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig adm pod-network make-projects-global kube-service-catalog - include: generate_certs.yml @@ -93,7 +93,7 @@ # only do this if we don't already have the updated role info - name: update edit role for service catalog and pod preset access command: > - oc replace -f {{ mktemp.stdout }}/edit_sc_patch.yml + {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig replace -f {{ mktemp.stdout }}/edit_sc_patch.yml when: - not edit_yaml.results.results[0] | oo_contains_rule(['servicecatalog.k8s.io'], ['serviceinstances', 'servicebindings'], ['create', 'update', 'delete', 'get', 'list', 'watch', 'patch']) or not edit_yaml.results.results[0] | oo_contains_rule(['settings.k8s.io'], ['podpresets'], ['create', 'update', 'delete', 'get', 'list', 'watch']) @@ -116,7 +116,7 @@ # only do this if we don't already have the updated role info - name: update admin role for service catalog and pod preset access command: > - oc replace -f {{ mktemp.stdout }}/admin_sc_patch.yml + {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig replace -f {{ mktemp.stdout }}/admin_sc_patch.yml when: - not admin_yaml.results.results[0] | oo_contains_rule(['servicecatalog.k8s.io'], ['serviceinstances', 'servicebindings'], ['create', 'update', 'delete', 'get', 'list', 'watch', 'patch']) or not admin_yaml.results.results[0] | oo_contains_rule(['settings.k8s.io'], ['podpresets'], ['create', 'update', 'delete', 'get', 'list', 'watch']) @@ -139,7 +139,7 @@ # only do this if we don't already have the updated role info - name: update view role for service catalog access command: > - oc replace -f {{ mktemp.stdout }}/view_sc_patch.yml + {{ openshift.common.client_binary }} --config=/etc/origin/master/admin.kubeconfig replace -f {{ mktemp.stdout }}/view_sc_patch.yml when: - not view_yaml.results.results[0] | oo_contains_rule(['servicecatalog.k8s.io'], ['serviceinstances', 'servicebindings'], ['get', 'list', 'watch']) |