From ef7e1db913286c735953ce377de4ca38dfe0a6ed Mon Sep 17 00:00:00 2001 From: Clark Boylan <clark.boylan@gmail.com> Date: Tue, 9 Dec 2014 14:09:25 -0800 Subject: [PATCH] Use puppet inventory when running ansible. We have been using the explicit host file for ansible for too long. Go back to the puppet inventory ansible script so that all our nodes get puppeted. Do this by removing the ansible hostfile override in the puppetmaster.pp manifest. Change-Id: I87816ca09566bc267b7723c0c0ce148d55da5142 --- modules/openstack_project/manifests/puppetmaster.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp index 41876d1dfa..36c35346eb 100644 --- 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,