openstack
/
charm-designate-bind
Code Issues Proposed changes

Fix charm so that on focal it uses named service - 2 

Pre-focal the service was called 'bind9'.  On focal+ it is called
'named'. A previous commit [1] (also be me) didn't actually catch all of
the uses of bind9 as a service, so this concludes the set.

[1] Ida65c620fa81715d37e468217aea28f160cf31ee

Change-Id: Ifb5adfbb5a69a9b12ef9fb7c214b192642d11344
Closes-Bug: #1929770
This commit is contained in:
Alex Kavanagh 2021-07-06 15:21:39 +01:00
parent 8c8fff049f
commit 5205bceedf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/charm/openstack/designate_bind.py
View File

@ -406,10 +406,10 @@ class DesignateBindCharm(openstack_charm.OpenStackCharm):
sync_dir = self.setup_sync_dir(sync_time)
self.create_sync_src_info_file()
# FIXME Try freezing DNS rather than stopping bind
self.service_control('stop', ['bind9'])
self.service_control('stop', [self.default_service])
tar_file = '{}/{}.tar.gz'.format(sync_dir, sync_time)
self.create_zone_tarball(tar_file)
self.service_control('start', ['bind9'])
self.service_control('start', [self.default_service])
self.set_sync_info(sync_time, '{}.tar.gz'.format(sync_time))
def service_control(self, cmd, services):
@ -481,12 +481,12 @@ class DesignateBindCharm(openstack_charm.OpenStackCharm):
else:
url = DesignateBindCharm.get_sync_src()
if url:
self.service_control('stop', ['bind9'])
self.service_control('stop', [self.default_service])
self.wget_file(url, ZONE_DIR)
tar_file = url.split('/')[-1]
subprocess.check_call(['tar', 'xf', tar_file], cwd=ZONE_DIR)
os.remove('{}/{}'.format(ZONE_DIR, tar_file))
self.service_control('start', ['bind9'])
self.service_control('start', [self.default_service])
reactive.remove_state('sync.request.sent')
reactive.set_state('zones.initialised')
else: