Manage apparmor package installation for Debian

Add dependencies for apparmor-libvirt puppet resources

Change-Id: I2b724eff36d201f31b7b8dbe0f60ce3a352df1a2
Closes-Bug: 1666176
This commit is contained in:
Oleksiy Molchanov 2017-02-20 12:37:54 +02:00
parent 0dd98ae477
commit b2024b95e1
2 changed files with 21 additions and 7 deletions

View File

@ -445,8 +445,13 @@ class openstack_tasks::roles::compute {
}
}
'Debian': {
package { 'apparmor':
ensure => installed,
}
service { 'apparmor':
ensure => running,
ensure => running,
require => Package['apparmor'],
}
file_line { 'qemu_apparmor':
@ -457,14 +462,16 @@ class openstack_tasks::roles::compute {
}
file_line { 'apparmor_libvirtd':
path => '/etc/apparmor.d/usr.sbin.libvirtd',
line => "# unix, # shouldn't be used for libvirt/qemu",
match => '^[#[:space:]]*unix',
path => '/etc/apparmor.d/usr.sbin.libvirtd',
line => "# unix, # shouldn't be used for libvirt/qemu",
match => '^[#[:space:]]*unix',
require => Package['libvirt'],
}
exec { 'refresh_apparmor':
refreshonly => true,
command => '/sbin/apparmor_parser -r /etc/apparmor.d/usr.sbin.libvirtd',
require => Package['apparmor'],
subscribe => File_line['apparmor_libvirtd'],
}
}

View File

@ -261,6 +261,9 @@ describe manifest do
).that_notifies('Service[libvirt]')
end
elsif facts[:osfamily] == 'Debian'
should contain_package('apparmor').with(
'ensure' => 'installed',
)
should contain_service('apparmor').with(
'ensure' => 'running',
)
@ -270,10 +273,14 @@ describe manifest do
'require' => ['Package[libvirt]', 'Service[apparmor]'],
).that_notifies('Service[libvirt]')
should contain_file_line('apparmor_libvirtd').with(
'path' => '/etc/apparmor.d/usr.sbin.libvirtd',
'line' => "# unix, # shouldn't be used for libvirt/qemu",
'path' => '/etc/apparmor.d/usr.sbin.libvirtd',
'line' => "# unix, # shouldn't be used for libvirt/qemu",
'require' => 'Package[libvirt]',
)
should contain_exec('refresh_apparmor').that_subscribes_to('File_line[apparmor_libvirtd]')
should contain_exec('refresh_apparmor').with(
'command' => '/sbin/apparmor_parser -r /etc/apparmor.d/usr.sbin.libvirtd',
'require' => 'Package[apparmor]',
).that_subscribes_to('File_line[apparmor_libvirtd]')
end
end