diff --git a/modules/openstack_project/files/puppetmaster/infracloud b/modules/openstack_project/files/puppetmaster/infracloud
new file mode 100644
index 0000000000..7c529dd739
--- /dev/null
+++ b/modules/openstack_project/files/puppetmaster/infracloud
@@ -0,0 +1,56 @@
+# this disables infracloud until we are ready
+[disabled:children]
+infracloud-west-compute
+infracloud-west-controller
+
+[infracloud-west-controller]
+controller00.hpuswest.ic.openstack.org
+
+
+[infracloud-west-compute]
+compute000.hpuswest.ic.openstack.org
+compute001.hpuswest.ic.openstack.org
+compute002.hpuswest.ic.openstack.org
+compute003.hpuswest.ic.openstack.org
+compute004.hpuswest.ic.openstack.org
+#compute005.hpuswest.ic.openstack.org # iLO doesn't ping
+compute006.hpuswest.ic.openstack.org
+compute007.hpuswest.ic.openstack.org
+#compute008.hpuswest.ic.openstack.org # needs ilo firmware update
+compute009.hpuswest.ic.openstack.org
+#compute010.hpuswest.ic.openstack.org # iLO doesn't ping
+compute011.hpuswest.ic.openstack.org
+compute012.hpuswest.ic.openstack.org
+compute013.hpuswest.ic.openstack.org
+compute014.hpuswest.ic.openstack.org
+#compute015.hpuswest.ic.openstack.org # needs iLO firmware update
+compute016.hpuswest.ic.openstack.org
+compute017.hpuswest.ic.openstack.org
+#compute018.hpuswest.ic.openstack.org # nic issues
+compute019.hpuswest.ic.openstack.org
+compute020.hpuswest.ic.openstack.org
+compute021.hpuswest.ic.openstack.org
+#compute022.hpuswest.ic.openstack.org # current baremetal00
+compute023.hpuswest.ic.openstack.org
+compute024.hpuswest.ic.openstack.org
+compute025.hpuswest.ic.openstack.org
+compute026.hpuswest.ic.openstack.org
+compute027.hpuswest.ic.openstack.org
+compute028.hpuswest.ic.openstack.org
+compute029.hpuswest.ic.openstack.org
+compute030.hpuswest.ic.openstack.org
+compute031.hpuswest.ic.openstack.org
+compute032.hpuswest.ic.openstack.org
+compute033.hpuswest.ic.openstack.org
+compute034.hpuswest.ic.openstack.org
+compute035.hpuswest.ic.openstack.org
+compute036.hpuswest.ic.openstack.org
+#compute037.hpuswest.ic.openstack.org # needs IPMI password reset
+compute038.hpuswest.ic.openstack.org
+compute038.hpuswest.ic.openstack.org
+#compute039.hpuswest.ic.openstack.org # disk errors
+#compute040.hpuswest.ic.openstack.org # needs ilo firmware update
+compute041.hpuswest.ic.openstack.org
+compute042.hpuswest.ic.openstack.org
+compute043.hpuswest.ic.openstack.org
+
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 44040d2322..cb7bd7db18 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -196,6 +196,9 @@ class openstack_project::puppetmaster (
     require => Cron['restartjenkinsmasters'],
   }
 
+  # Ansible mgmt
+  # TODO: Put this into its own class, maybe called bastion::ansible or something
+
   vcsrepo { '/opt/ansible':
     ensure   => latest,
     provider => git,
@@ -231,6 +234,14 @@ class openstack_project::puppetmaster (
     mode    => '0644',
   }
 
+  file { '/etc/ansible/hosts/infracloud':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    source  => 'puppet:///modules/openstack_project/puppetmaster/infracloud',
+  }
+
   file { '/etc/ansible/groups.txt':
     owner   => 'root',
     group   => 'root',