diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-12 08:30:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-12 08:30:33 -0400 |
| commit | 187c8805fcc1bb021481e1aa7768e68b49334166 (patch) | |
| tree | 14b64b805b237253778ab7188560ac954172d738 | |
| parent | 8daf3d92028cc6643cee438754ea3c08af540bef (diff) | |
| parent | 408eaa1b50d58d3e1378f4fa5f1ddd2196bf2fd9 (diff) | |
| download | openshift-187c8805fcc1bb021481e1aa7768e68b49334166.tar.gz openshift-187c8805fcc1bb021481e1aa7768e68b49334166.tar.bz2 openshift-187c8805fcc1bb021481e1aa7768e68b49334166.tar.xz openshift-187c8805fcc1bb021481e1aa7768e68b49334166.zip | |
Merge pull request #5074 from mtnbikenc/fix-duplicate-evaluate
Fix duplicate evaluate_groups.yml call during install
| -rw-r--r-- | playbooks/byo/openshift-cluster/service-catalog.yml | 6 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/service_catalog.yml | 1 |
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 |