summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-08-11 16:37:15 -0400
committerRussell Teague <rteague@redhat.com>2017-08-11 16:37:15 -0400
commit408eaa1b50d58d3e1378f4fa5f1ddd2196bf2fd9 (patch)
tree14b64b805b237253778ab7188560ac954172d738
parent8daf3d92028cc6643cee438754ea3c08af540bef (diff)
downloadopenshift-408eaa1b50d58d3e1378f4fa5f1ddd2196bf2fd9.tar.gz
openshift-408eaa1b50d58d3e1378f4fa5f1ddd2196bf2fd9.tar.bz2
openshift-408eaa1b50d58d3e1378f4fa5f1ddd2196bf2fd9.tar.xz
openshift-408eaa1b50d58d3e1378f4fa5f1ddd2196bf2fd9.zip
Fix duplicate evaluate_groups.yml call during install
The way the service_catalog.yml playbook calls evaluate_groups.yml causes the evaluation to happen twice during a standard byo/config.yml installation. Refactoring the service_catalog.yml playbooks to remove this duplicate.
-rw-r--r--playbooks/byo/openshift-cluster/service-catalog.yml6
-rw-r--r--playbooks/common/openshift-cluster/service_catalog.yml1
2 files changed, 6 insertions, 1 deletions
diff --git a/playbooks/byo/openshift-cluster/service-catalog.yml b/playbooks/byo/openshift-cluster/service-catalog.yml
index a9fc18958..6f95b4e2d 100644
--- a/playbooks/byo/openshift-cluster/service-catalog.yml
+++ b/playbooks/byo/openshift-cluster/service-catalog.yml
@@ -5,6 +5,12 @@
# currently supported method.
#
- include: initialize_groups.yml
+ tags:
+ - always
+
+- include: ../../common/openshift-cluster/std_include.yml
+ tags:
+ - always
- include: ../../common/openshift-cluster/service_catalog.yml
vars:
diff --git a/playbooks/common/openshift-cluster/service_catalog.yml b/playbooks/common/openshift-cluster/service_catalog.yml
index 6c12875fe..599350258 100644
--- a/playbooks/common/openshift-cluster/service_catalog.yml
+++ b/playbooks/common/openshift-cluster/service_catalog.yml
@@ -1,5 +1,4 @@
---
-- include: evaluate_groups.yml
- name: Update Master configs
hosts: oo_masters