Fix designate consuming notfications erroneously

Stop designate sink service from consuming notifications when
no sink service is defined.

Change-Id: Id5160f7c40e1a699715953bf9e89adbbfdc88ec5
Closes-Bug: #1755780
This commit is contained in:
Liam Young 2018-03-14 11:30:54 +00:00
parent 4167f18def
commit 45d2b91051
2 changed files with 10 additions and 1 deletions

View File

@ -208,6 +208,15 @@ class DesignateConfigurationAdapter(
return DesignateCharm.get_domain_id(domain)
return None
@property
def notification_handlers(self):
handlers = []
if os.path.exists(NOVA_SINK_FILE):
handlers.append('nova_fixed')
if os.path.exists(NEUTRON_SINK_FILE):
handlers.append('neutron_floatingip')
return ','.join(handlers)
@property
def nova_conf_args(self):
"""Returns config file directive to point daemons at nova config file.

View File

@ -150,7 +150,7 @@ enable_api_v2 = True
# List of notification handlers to enable, configuration of these needs to
# correspond to a [handler:my_driver] section below or else in the config
# Can be one or more of : nova_fixed, neutron_floatingip
enabled_notification_handlers = nova_fixed, neutron_floatingip
enabled_notification_handlers = {{ options.notification_handlers }}
#-----------------------
# mDNS Service