summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-26 09:08:54 -0400
committerGitHub <noreply@github.com>2017-06-26 09:08:54 -0400
commitb64cfec4ebf9b95a8627de23bc8a15bd77fc1eb7 (patch)
tree3f6794b3856ce4ddd31709c96cb4da09861d3f90 /playbooks/common
parent88690667342bca0e7df75bc90bb1846b63d6d78a (diff)
parentc299b9f199cedadf4a102ea9aaa4e33e9de6b301 (diff)
downloadopenshift-b64cfec4ebf9b95a8627de23bc8a15bd77fc1eb7.tar.gz
openshift-b64cfec4ebf9b95a8627de23bc8a15bd77fc1eb7.tar.bz2
openshift-b64cfec4ebf9b95a8627de23bc8a15bd77fc1eb7.tar.xz
openshift-b64cfec4ebf9b95a8627de23bc8a15bd77fc1eb7.zip
Merge pull request #4195 from ewolinetz/service_catalog
Creation of service_catalog and broker roles
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/config.yml6
-rw-r--r--playbooks/common/openshift-cluster/service_catalog.yml8
2 files changed, 14 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 1482b3a3f..2a75b8dc3 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -45,6 +45,12 @@
tags:
- hosted
+- include: service_catalog.yml
+ when:
+ - openshift_enable_service_catalog | default(false) | bool
+ tags:
+ - servicecatalog
+
- name: Re-enable excluder if it was previously enabled
hosts: oo_masters_to_config:oo_nodes_to_config
tags:
diff --git a/playbooks/common/openshift-cluster/service_catalog.yml b/playbooks/common/openshift-cluster/service_catalog.yml
new file mode 100644
index 000000000..c42e8781a
--- /dev/null
+++ b/playbooks/common/openshift-cluster/service_catalog.yml
@@ -0,0 +1,8 @@
+---
+- include: evaluate_groups.yml
+
+- name: Service Catalog
+ hosts: oo_first_master
+ roles:
+ - openshift_service_catalog
+ - ansible_service_broker