From 408eaa1b50d58d3e1378f4fa5f1ddd2196bf2fd9 Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Fri, 11 Aug 2017 16:37:15 -0400
Subject: 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.
---
 playbooks/byo/openshift-cluster/service-catalog.yml    | 6 ++++++
 playbooks/common/openshift-cluster/service_catalog.yml | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3