openstack
/
charm-designate
Code Issues Proposed changes

Merge "Remove support for updates via notifications"

This commit is contained in:
Zuul 2018-02-22 09:38:46 +00:00 committed by Gerrit Code Review
parent f761fd5611 eed4594c72
commit e849fad134
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/charm/openstack/designate.py
View File

@ -388,6 +388,12 @@ class DesignateCharm(openstack_charm.HAOpenStackCharm):
hookenv.log("Problem with 'dns-slaves' config: {}"
.format(str(e)), level=hookenv.ERROR)
def configure_sink(self):
cmp_os_release = ch_utils.CompareOpenStackReleases(
self.release
)
return cmp_os_release < 'queens'
@classmethod
@decorators.retry_on_exception(
40, base_delay=5, exc_type=subprocess.CalledProcessError)
@ -534,16 +540,17 @@ class DesignateCharm(openstack_charm.HAOpenStackCharm):
format(str(e)))
def custom_assess_status_check(self):
if (not hookenv.config('nameservers') and
(hookenv.config('nova-domain') or
hookenv.config('neutron-domain'))):
return 'blocked', ('nameservers must be set when specifying'
' nova-domain or neutron-domain')
dns_backend_available = (relations
.endpoint_from_flag('dns-backend.available'))
if self.configure_sink():
if (not hookenv.config('nameservers') and
(hookenv.config('nova-domain') or
hookenv.config('neutron-domain'))):
return 'blocked', ('nameservers must be set when specifying'
' nova-domain or neutron-domain')
invalid_dns = self.options.invalid_pool_config()
if invalid_dns:
return 'blocked', invalid_dns
dns_backend_available = (relations
.endpoint_from_flag('dns-backend.available'))
if not (dns_backend_available or hookenv.config('dns-slaves')):
return 'blocked', ('Need either a dns-backend relation or '
'config(dns-slaves) or both.')

5
src/reactive/designate_handlers.py
View File

@ -184,8 +184,9 @@ def configure_designate_full(*args):
instance.render_full_config(args)
try:
# the following function should only run once for the leader.
instance.create_initial_servers_and_domains()
_render_sink_configs(instance, args)
if instance.configure_sink():
instance.create_initial_servers_and_domains()
_render_sink_configs(instance, args)
instance.render_rndc_keys()
instance.update_pools()
except subprocess.CalledProcessError as e: