Prechádzať zdrojové kódy

Merge pull request #10507 from e-minguez/openshift_version_provision_openstack

[openstack] Run the init/main playbook properly
OpenShift Merge Robot 6 rokov pred
rodič
commit
53031c45a1

+ 3 - 3
playbooks/openstack/openshift-cluster/install.yml

@@ -8,14 +8,14 @@
 # values here. We do it in the OSEv3 group vars. Do we need to add
 # some logic here?
 
+- name: Run the init
+  import_playbook: ../../init/main.yml
+
 - name: Evaluate basic OpenStack groups
   import_playbook: evaluate_groups.yml
 
 - import_playbook: ../../prerequisites.yml
 
-- name: Run the init
-  import_playbook: ../../init/main.yml
-
 - name: Prepare the Nodes in the cluster for installation
   any_errors_fatal: true
   hosts: oo_all_hosts

+ 3 - 1
playbooks/openstack/openshift-cluster/provision.yml

@@ -2,7 +2,6 @@
 - name: Create the OpenStack resources for cluster installation
   import_playbook: provision_resources.yml
 
-
 - name: Evaluate OpenStack groups from the dynamic inventory
   import_playbook: evaluate_groups.yml
 
@@ -43,6 +42,9 @@
 
 - import_playbook: ../../init/basic_facts.yml
 
+- name: Run the init
+  import_playbook: ../../init/main.yml
+
 - name: Optionally subscribe the RHEL nodes
   any_errors_fatal: true
   hosts: oo_all_hosts