Merge "Use puppet inventory when running ansible."
This commit is contained in:
commit
4fda217d25
@ -40,9 +40,7 @@ class openstack_project::puppetmaster (
|
|||||||
source => 'puppet:///modules/openstack_project/puppetmaster/production_environment.conf',
|
source => 'puppet:///modules/openstack_project/puppetmaster/production_environment.conf',
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'ansible':
|
include ansible
|
||||||
ansible_hostfile => '/etc/ansible/hostfile',
|
|
||||||
}
|
|
||||||
|
|
||||||
file { '/etc/ansible/hostfile':
|
file { '/etc/ansible/hostfile':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user