diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-21 20:21:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-21 20:21:52 -0700 |
| commit | 2adb0ebeb523daa5c3b1b8fd4bf77d679c5bd5d7 (patch) | |
| tree | 7ecff9c114cbbac05ee25939a17fabe679fbf17b /roles/openshift_service_catalog | |
| parent | ee8252d536c4204b9e0c4a88d0899297caf39423 (diff) | |
| parent | dace5169e0b5066a027746dd6f28f0268248043f (diff) | |
| download | openshift-2adb0ebeb523daa5c3b1b8fd4bf77d679c5bd5d7.tar.gz openshift-2adb0ebeb523daa5c3b1b8fd4bf77d679c5bd5d7.tar.bz2 openshift-2adb0ebeb523daa5c3b1b8fd4bf77d679c5bd5d7.tar.xz openshift-2adb0ebeb523daa5c3b1b8fd4bf77d679c5bd5d7.zip | |
Merge pull request #5226 from ewolinetz/template_service_broker
Automatic merge from submit-queue
Creating initial tsb role to consume and apply templates provided for…
… tsb
cc: @deads2k @sdodson
Addresses:
https://bugzilla.redhat.com/show_bug.cgi?id=1486623
https://bugzilla.redhat.com/show_bug.cgi?id=1470623
https://bugzilla.redhat.com/show_bug.cgi?id=1491626
Diffstat (limited to 'roles/openshift_service_catalog')
| -rw-r--r-- | roles/openshift_service_catalog/files/openshift-ansible-catalog-console.js | 3 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/tasks/install.yml | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/roles/openshift_service_catalog/files/openshift-ansible-catalog-console.js b/roles/openshift_service_catalog/files/openshift-ansible-catalog-console.js index 16a307c06..d0a9f11dc 100644 --- a/roles/openshift_service_catalog/files/openshift-ansible-catalog-console.js +++ b/roles/openshift_service_catalog/files/openshift-ansible-catalog-console.js @@ -1 +1,2 @@ -window.OPENSHIFT_CONSTANTS.ENABLE_TECH_PREVIEW_FEATURE.service_catalog_landing_page = true; +// empty file so that the master-config can still point to a file that exists +// this file will be replaced by the template service broker role if enabled diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml index d134867bd..faf1aea97 100644 --- a/roles/openshift_service_catalog/tasks/install.yml +++ b/roles/openshift_service_catalog/tasks/install.yml @@ -110,15 +110,6 @@ when: - not admin_yaml.results.results[0] | oo_contains_rule(['servicecatalog.k8s.io'], ['instances', 'bindings'], ['create', 'update', 'delete', 'get', 'list', 'watch']) or not admin_yaml.results.results[0] | oo_contains_rule(['settings.k8s.io'], ['podpresets'], ['create', 'update', 'delete', 'get', 'list', 'watch']) -- shell: > - oc get policybindings/kube-system:default -n kube-system || echo "not found" - register: get_kube_system - changed_when: no - -- command: > - oc create policybinding kube-system -n kube-system - when: "'not found' in get_kube_system.stdout" - - oc_adm_policy_user: namespace: kube-service-catalog resource_kind: scc |