Merge "Use puppet inventory when running ansible."

2014-12-10 00:13:40 +00:00 · 2014-12-10 00:13:40 +00:00 · 4fda217d25
commit 4fda217d25
parent d2e0ad9873 ef7e1db913
1 changed files with 1 additions and 3 deletions
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@ -40,9 +40,7 @@ class openstack_project::puppetmaster (
    source => 'puppet:///modules/openstack_project/puppetmaster/production_environment.conf',
  }

-  class { 'ansible':
-    ansible_hostfile => '/etc/ansible/hostfile',
-  }
+  include ansible

  file { '/etc/ansible/hostfile':
    ensure  => present,