Manage apparmor package installation for Debian
Add dependencies for apparmor-libvirt puppet resources
Change-Id: I2b724eff36d201f31b7b8dbe0f60ce3a352df1a2
Closes-Bug: 1666176
(cherry picked from commit b2024b95e1
)
This commit is contained in:
parent
6a39d7d08b
commit
03ccb82d38
@ -448,8 +448,13 @@ class openstack_tasks::roles::compute {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
'Debian': {
|
'Debian': {
|
||||||
|
package { 'apparmor':
|
||||||
|
ensure => installed,
|
||||||
|
}
|
||||||
|
|
||||||
service { 'apparmor':
|
service { 'apparmor':
|
||||||
ensure => running,
|
ensure => running,
|
||||||
|
require => Package['apparmor'],
|
||||||
}
|
}
|
||||||
|
|
||||||
file_line { 'qemu_apparmor':
|
file_line { 'qemu_apparmor':
|
||||||
@ -460,14 +465,16 @@ class openstack_tasks::roles::compute {
|
|||||||
}
|
}
|
||||||
|
|
||||||
file_line { 'apparmor_libvirtd':
|
file_line { 'apparmor_libvirtd':
|
||||||
path => '/etc/apparmor.d/usr.sbin.libvirtd',
|
path => '/etc/apparmor.d/usr.sbin.libvirtd',
|
||||||
line => "# unix, # shouldn't be used for libvirt/qemu",
|
line => "# unix, # shouldn't be used for libvirt/qemu",
|
||||||
match => '^[#[:space:]]*unix',
|
match => '^[#[:space:]]*unix',
|
||||||
|
require => Package['libvirt'],
|
||||||
}
|
}
|
||||||
|
|
||||||
exec { 'refresh_apparmor':
|
exec { 'refresh_apparmor':
|
||||||
refreshonly => true,
|
refreshonly => true,
|
||||||
command => '/sbin/apparmor_parser -r /etc/apparmor.d/usr.sbin.libvirtd',
|
command => '/sbin/apparmor_parser -r /etc/apparmor.d/usr.sbin.libvirtd',
|
||||||
|
require => Package['apparmor'],
|
||||||
subscribe => File_line['apparmor_libvirtd'],
|
subscribe => File_line['apparmor_libvirtd'],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -260,6 +260,9 @@ describe manifest do
|
|||||||
).that_notifies('Service[libvirt]')
|
).that_notifies('Service[libvirt]')
|
||||||
end
|
end
|
||||||
elsif facts[:osfamily] == 'Debian'
|
elsif facts[:osfamily] == 'Debian'
|
||||||
|
should contain_package('apparmor').with(
|
||||||
|
'ensure' => 'installed',
|
||||||
|
)
|
||||||
should contain_service('apparmor').with(
|
should contain_service('apparmor').with(
|
||||||
'ensure' => 'running',
|
'ensure' => 'running',
|
||||||
)
|
)
|
||||||
@ -269,10 +272,14 @@ describe manifest do
|
|||||||
'require' => ['Package[libvirt]', 'Service[apparmor]'],
|
'require' => ['Package[libvirt]', 'Service[apparmor]'],
|
||||||
).that_notifies('Service[libvirt]')
|
).that_notifies('Service[libvirt]')
|
||||||
should contain_file_line('apparmor_libvirtd').with(
|
should contain_file_line('apparmor_libvirtd').with(
|
||||||
'path' => '/etc/apparmor.d/usr.sbin.libvirtd',
|
'path' => '/etc/apparmor.d/usr.sbin.libvirtd',
|
||||||
'line' => "# unix, # shouldn't be used for libvirt/qemu",
|
'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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user