diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 605901238b..0ce6c31ded 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -233,6 +233,9 @@ class openstack_project::puppetmaster (
 
   file { '/etc/ansible/hosts':
     ensure  => directory,
+    owner   => 'root',
+    group   => 'admin',
+    mode    => '0755',
   }
 
   file { '/etc/ansible/hosts/puppet':
@@ -255,8 +258,15 @@ class openstack_project::puppetmaster (
   file { '/etc/ansible/hosts/emergency':
     ensure  => present,
     owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
+    group   => 'admin',
+    mode    => '0664',
+  }
+
+  file { '/etc/ansible/hosts/generated-groups':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'admin',
+    mode    => '0664',
   }
 
   file { '/etc/ansible/hosts/infracloud':
@@ -275,6 +285,20 @@ class openstack_project::puppetmaster (
     notify => Exec['expand_groups'],
   }
 
+  file { '/var/cache/ansible-inventory':
+    ensure  => directory,
+    owner   => 'root',
+    group   => 'admin',
+    mode    => '2775',
+  }
+
+  file { '/var/cache/ansible-inventory/ansible-inventory.cache':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'admin',
+    mode    => '0664',
+  }
+
   file { '/usr/local/bin/expand-groups.sh':
     owner  => 'root',
     group  => 'root',