openstack
/
charm-ceph-osd
Code Issues Proposed changes

Fix ceph-osd disk removal on Jammy 

Closes-Bug: #1987695
Change-Id: I7523e8fa0f6b62329eefcce6daf250881812943c
This commit is contained in:
Chris MacNaughton 2022-08-25 14:12:38 -04:00
parent 9fa1b45fe8
commit 0b8a583892
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actions/remove_disk.py
View File

@ -18,6 +18,7 @@ import datetime
import errno
import json
from math import ceil
import os
import subprocess
import sys
import time
@ -240,6 +241,14 @@ class ActionOSD:
# Stop the OSD service.
hookenv.log('Stopping the OSD service', hookenv.DEBUG)
charms_ceph.utils.stop_osd(self.osd_id[4:])
charms_ceph.utils.disable_osd(self.osd_id[4:])
unit_filename = \
'/run/systemd/system/ceph-osd.target.wants/ceph-osd@{}.service' \
.format(self.osd_id[4:])
if os.path.exists(unit_filename):
os.remove(unit_filename)
subprocess.check_call(['systemctl', 'daemon-reload'])
# Remove the OSD from the cluster.
hookenv.log('Destroying the OSD', hookenv.DEBUG)