Merge "Add infracloud playbook"

modules/openstack_project/files/puppetmaster/infracloud

@@ -1,7 +1,3 @@
-# this disables infracloud until we are ready
-[disabled:children]
-infracloud
-
 [infracloud]
 controller00.hpuswest.ic.openstack.org
 compute000.hpuswest.ic.openstack.org
@@ -49,3 +45,5 @@ compute038.hpuswest.ic.openstack.org
 compute041.hpuswest.ic.openstack.org
 compute042.hpuswest.ic.openstack.org
 compute043.hpuswest.ic.openstack.org
+
+#TODO Add baremetal controller host here

playbooks/remote_puppet_else.yaml

@@ -1,4 +1,4 @@
-- hosts: '!review.openstack.org:!git0*:!afs*:!puppetmaster*:!disabled'
+- hosts: '!review.openstack.org:!git0*:!afs*:!baremetal*:!controller:!compute:!puppetmaster*:!disabled'
   gather_facts: true
   roles:
   - role: puppet

playbooks/remote_puppet_infracloud.yaml

@@ -0,0 +1,10 @@
+---
+# TODO add baremetal controller here
+- hosts: "controller*.ic.openstack.org:!disabled"
+  gather_facts: true
+  roles:
+    - role: puppet
+- hosts: "compute*.ic.openstack.org:!disabled"
+  gather_facts: true
+  roles:
+    - role: puppet

run_all.sh

@@ -34,5 +34,6 @@ ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/remote_puppet_git.yaml
 # Run AFS changes separately so we can make sure to only do one at a time
 # (turns out quorum is nice to have)
 ansible-playbook -f 1 ${ANSIBLE_PLAYBOOKS}/remote_puppet_afs.yaml
+ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/remote_puppet_infracloud.yaml
 # Run everything else. We do not care if the other things worked
 ansible-playbook -f 20 ${ANSIBLE_PLAYBOOKS}/remote_puppet_else.yaml