From a1cc43a006ca4def22b5b65d63d41d3cfe86f430 Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Thu, 16 Nov 2017 09:45:19 -0500 Subject: Fix openstack init --- playbooks/openstack/openshift-cluster/install.yml | 7 ++----- playbooks/openstack/openshift-cluster/provision.yml | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'playbooks/openstack') 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 -- cgit v1.2.1