openstack
/
charm-ceph-osd
Code Issues Proposed changes

Reload OSD when AppArmor policies are changed 

When AppArmor profiles are updated, the OSD processes need to be
restarted as well to make the new polocy effective.
Policy files can change on charm upgrade.

Change-Id: Ib0dbcfd11949451e3abc0b2b7477a5f474bae234
Partial-Bug: 1755823
This commit is contained in:
Tilman Baumann 2018-04-03 15:56:43 +02:00
parent e179d36802
commit 9f5d3429c8
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hooks/ceph_hooks.py
View File

@ -135,8 +135,23 @@ def tune_network_adapters():
ceph.tune_nic(interface)
@restart_on_change({'/etc/apparmor.d/usr.bin.ceph-osd': ['apparmor']},
restart_functions={'apparmor': service_reload})
def aa_profile_changed(service_name='ceph-osd-all'):
"""
Reload AA profie and restart OSD processes.
"""
log("Loading new AppArmor profile")
service_reload('apparmor')
log("Restarting ceph-osd services with new AppArmor profile")
if ceph.systemd():
for osd_id in ceph.get_local_osd_ids():
service_restart('ceph-osd@{}'.format(osd_id))
else:
service_restart(service_name)
@restart_on_change({
'/etc/apparmor.d/usr.bin.ceph-osd': ['ceph-osd-all']},
restart_functions={'ceph-osd-all': aa_profile_changed})
def copy_profile_into_place():
"""
Copy the apparmor profiles included with the charm
@ -175,12 +190,7 @@ def install_apparmor_profile():
if config().changed('aa-profile-mode'):
aa_context = CephOsdAppArmorContext()
aa_context.setup_aa_profile()
service_reload('apparmor')
if ceph.systemd():
for osd_id in ceph.get_local_osd_ids():
service_restart('ceph-osd@{}'.format(osd_id))
else:
service_restart('ceph-osd-all')
aa_profile_changed()
@hooks.hook('install.real')