Merge pull request #6142 from mtnbikenc/fix-init

Fix openstack init

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

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