Merge pull request #6951 from tomassedovic/fix-openstack-master

Automatic merge from submit-queue.

Fix OpenStack playbooks

This shuffles a few playbooks around to fix the ordering between various
facts and prerequisites.

playbooks/openstack/openshift-cluster/install.yml

@@ -8,8 +8,7 @@
 # values here. We do it in the OSEv3 group vars. Do we need to add
 # some logic here?
 
-- name: run the cluster deploy
-  import_playbook: ../../prerequisites.yml
+- import_playbook: ../../prerequisites.yml
 
 - name: run the cluster deploy
   import_playbook: ../../deploy_cluster.yml

playbooks/openstack/openshift-cluster/provision.yml

@@ -26,9 +26,6 @@
   - name: Gather facts for the new nodes
     setup:
 
-- import_playbook: ../../init/basic_facts.yml
-- import_playbook: ../../init/cluster_facts.yml
-
 
 # TODO(shadower): consider splitting this up so people can stop here
 # and configure their DNS if they have to.
@@ -43,7 +40,10 @@
     - openshift_openstack_external_nsupdate_keys is defined
     - openshift_openstack_external_nsupdate_keys.private is defined or openshift_openstack_external_nsupdate_keys.public is defined
 
-- name: Prepare the Nodes in the cluster for installation
+
+- import_playbook: ../../init/basic_facts.yml
+
+- name: Optionally subscribe the RHEL nodes
   hosts: oo_all_hosts
   become: yes
   gather_facts: yes
@@ -63,6 +63,12 @@
     - ansible_distribution == "RedHat"
     - rh_subscribed is defined
 
+
+- name: Prepare the Nodes in the cluster for installation
+  hosts: oo_all_hosts
+  become: yes
+  gather_facts: yes
+  tasks:
   - name: Install dependencies
     import_role:
       name: openshift_openstack

roles/openshift_openstack/defaults/main.yml

@@ -21,16 +21,15 @@ openshift_openstack_cluster_node_labels:
 
 openshift_openstack_install_debug_packages: false
 openshift_openstack_required_packages:
-  - docker
   - NetworkManager
-  - wget
-  - git
-  - net-tools
-  - bind-utils
-  - bridge-utils
 openshift_openstack_debug_packages:
   - bash-completion
+  - bind-utils
+  - bridge-utils
+  - git
+  - net-tools
   - vim-enhanced
+  - wget
 
 # container-storage-setup
 openshift_openstack_container_storage_setup: