summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-16 09:59:27 -0500
committerGitHub <noreply@github.com>2017-11-16 09:59:27 -0500
commit7a18158c1df667d2bc45fae3ca62ed35400bedb8 (patch)
tree74bfeab6c9fabfa42860453cb93be82b045c0565
parent8a85bc3a00efb654238a58e1faa2a2629d9360b1 (diff)
parenta1cc43a006ca4def22b5b65d63d41d3cfe86f430 (diff)
downloadopenshift-7a18158c1df667d2bc45fae3ca62ed35400bedb8.tar.gz
openshift-7a18158c1df667d2bc45fae3ca62ed35400bedb8.tar.bz2
openshift-7a18158c1df667d2bc45fae3ca62ed35400bedb8.tar.xz
openshift-7a18158c1df667d2bc45fae3ca62ed35400bedb8.zip
Merge pull request #6142 from mtnbikenc/fix-init
Fix openstack init
-rw-r--r--playbooks/openstack/openshift-cluster/install.yml7
-rw-r--r--playbooks/openstack/openshift-cluster/provision.yml4
2 files changed, 3 insertions, 8 deletions
diff --git a/playbooks/openstack/openshift-cluster/install.yml b/playbooks/openstack/openshift-cluster/install.yml
index 40d4767ba..1c4f609e3 100644
--- a/playbooks/openstack/openshift-cluster/install.yml
+++ b/playbooks/openstack/openshift-cluster/install.yml
@@ -8,11 +8,8 @@
# values here. We do it in the OSEv3 group vars. Do we need to add
# some logic here?
-- name: normalize groups
- include: ../../byo/openshift-cluster/initialize_groups.yml
-
-- name: run the std_include
- include: ../../common/openshift-cluster/std_include.yml
+- name: run the initialization
+ include: ../../init/main.yml
- name: run the config
include: ../../common/openshift-cluster/config.yml
diff --git a/playbooks/openstack/openshift-cluster/provision.yml b/playbooks/openstack/openshift-cluster/provision.yml
index fe3057158..36d8c8215 100644
--- a/playbooks/openstack/openshift-cluster/provision.yml
+++ b/playbooks/openstack/openshift-cluster/provision.yml
@@ -9,10 +9,8 @@
# NOTE(shadower): Bring in the host groups:
-- name: normalize groups
- include: ../../byo/openshift-cluster/initialize_groups.yml
- name: evaluate groups
- include: ../../common/openshift-cluster/evaluate_groups.yml
+ include: ../../init/evaluate_groups.yml
- name: Wait for the nodes and gather their facts