Stop installing the puppet inventory
Pulling inventory from puppetmaster was a neat hack, but it was also a hack. Let's stop providing it. Depends-On: Ic6809ed0b7014d7aebd414bf3a342e3a37eb10b6 Change-Id: I6bb66cecca8c3ddd6d2cef2a05324faa67ca98c2
This commit is contained in:
parent
a133b81441
commit
4cf7f3da7b
|
@ -1,7 +1,7 @@
|
|||
# == Class: ansible
|
||||
#
|
||||
class ansible (
|
||||
$ansible_hostfile = '/usr/local/bin/puppet-inventory',
|
||||
$ansible_hostfile = '/etc/ansible/hosts',
|
||||
$ansible_roles_path = '/etc/ansible/roles'
|
||||
) {
|
||||
|
||||
|
@ -29,11 +29,7 @@ class ansible (
|
|||
}
|
||||
|
||||
file { '/usr/local/bin/puppet-inventory':
|
||||
ensure => present,
|
||||
mode => '0755',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
source => 'puppet:///modules/ansible/puppet-inventory',
|
||||
ensure => absent,
|
||||
}
|
||||
|
||||
::logrotate::file { 'ansible':
|
||||
|
|
|
@ -38,13 +38,6 @@ describe 'puppet-ansible module' do
|
|||
its(:content) { should include 'library=/usr/share/ansible' }
|
||||
end
|
||||
|
||||
describe file('/usr/local/bin/puppet-inventory') do
|
||||
it { should be_file }
|
||||
it { should be_owned_by 'root' }
|
||||
it { should be_grouped_into 'root' }
|
||||
its(:content) { should include "'_meta': {'hostvars': dict()}," }
|
||||
end
|
||||
|
||||
describe file('/etc/logrotate.d/ansible') do
|
||||
its(:content) { should include '/var/log/ansible.log' }
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue