Преглед на файлове

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.
Russell Teague преди 7 години
родител
ревизия
408eaa1b50
променени са 2 файла, в които са добавени 6 реда и са изтрити 1 реда
  1. 6 0
      playbooks/byo/openshift-cluster/service-catalog.yml
  2. 0 1
      playbooks/common/openshift-cluster/service_catalog.yml

+ 6 - 0
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:

+ 0 - 1
playbooks/common/openshift-cluster/service_catalog.yml

@@ -1,5 +1,4 @@
 ---
-- include: evaluate_groups.yml
 
 - name: Update Master configs
   hosts: oo_masters