From e2d0ebb3bf2cc37f44af53dfad9e1789713fd3b9 Mon Sep 17 00:00:00 2001 From: ewolinetz Date: Mon, 3 Apr 2017 15:01:41 -0500 Subject: Creation of service_catalog and placeholder broker roles --- playbooks/common/openshift-cluster/config.yml | 6 ++++++ playbooks/common/openshift-cluster/service_catalog.yml | 8 ++++++++ 2 files changed, 14 insertions(+) create mode 100644 playbooks/common/openshift-cluster/service_catalog.yml (limited to 'playbooks/common') 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..dd1d33525 --- /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 + - openshift_service_catalog_broker -- cgit v1.2.3 From 3b538cc3951a38dd499fbf4ce54476f0d4ec25eb Mon Sep 17 00:00:00 2001 From: Fabian von Feilitzsch Date: Thu, 8 Jun 2017 11:31:24 -0400 Subject: add play and role to install ansible-service-broker * add ansible-service-broker role to catalog install playbook add ansible_service_broker to catalog install flow fix indentation syntax error respond to code review Remove content, update image prefix to exclude image name Make variables deployment type specific, add rhcc configuration, add fact validation some spacing/comments Remove ansible_service_broker_namespace variable Fix stupid typo == nil -> is none nil -> null, fix validation checks Fix a few typos Add Broker object to catalog replace oc_pvc creation with oc_obj remove namespace from broker creation fix namespace --- playbooks/common/openshift-cluster/service_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks/common') diff --git a/playbooks/common/openshift-cluster/service_catalog.yml b/playbooks/common/openshift-cluster/service_catalog.yml index dd1d33525..c42e8781a 100644 --- a/playbooks/common/openshift-cluster/service_catalog.yml +++ b/playbooks/common/openshift-cluster/service_catalog.yml @@ -5,4 +5,4 @@ hosts: oo_first_master roles: - openshift_service_catalog - - openshift_service_catalog_broker + - ansible_service_broker -- cgit v1.2.3