Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/237323
Change subject: Update for kilo ...................................................................... Update for kilo Change-Id: I9fa73ca136e4d31e72bca01ca969fbb54456d481 --- M nova_fixed_multi/base.py M nova_fixed_multi/novamulti.py M setup.py 3 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/sink_nova_fixed_multi refs/changes/23/237323/1 diff --git a/nova_fixed_multi/base.py b/nova_fixed_multi/base.py index cb4895f..8076f48 100644 --- a/nova_fixed_multi/base.py +++ b/nova_fixed_multi/base.py @@ -25,6 +25,7 @@ from designate.context import DesignateContext from designate.notification_handler.base import BaseAddressHandler from designate.notification_handler.base import get_ip_data +from designate.objects import Record from designate.plugin import ExtensionPlugin LOG = logging.getLogger(__name__) @@ -93,7 +94,7 @@ central_api.create_record(context, reverse_domain['id'], recordset['id'], - record_values) + Record(**record_values)) for fmt in cfg.CONF[self.name].get('format'): recordset_values = { @@ -120,7 +121,7 @@ central_api.create_record(context, domain['id'], recordset['id'], - record_values) + Record(**record_values)) def _delete(self, managed=True, resource_id=None, resource_type='instance', criterion={}): diff --git a/nova_fixed_multi/novamulti.py b/nova_fixed_multi/novamulti.py index 02c4530..9e28417 100644 --- a/nova_fixed_multi/novamulti.py +++ b/nova_fixed_multi/novamulti.py @@ -47,8 +47,7 @@ def get_exchange_topics(self): exchange = cfg.CONF[self.name].control_exchange - topics = [topic + ".info" - for topic in cfg.CONF[self.name].notification_topics] + topics = [topic for topic in cfg.CONF[self.name].notification_topics] return (exchange, topics) @@ -58,7 +57,7 @@ 'compute.instance.delete.start', ] - def process_notification(self, event_type, payload): + def process_notification(self, context, event_type, payload): LOG.debug('NovaFixedHandler received notification - %s' % event_type) if event_type == 'compute.instance.create.end': diff --git a/setup.py b/setup.py index 71d8172..45e10bf 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setuptools.setup( name="nova_fixed_multi", - version="2015.6", + version="2015.9", author="Wikimedia Foundation", author_email="abog...@wikimedia.org", description="Designate sink handler that supports multiple arecords per instance", -- To view, visit https://gerrit.wikimedia.org/r/237323 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fa73ca136e4d31e72bca01ca969fbb54456d481 Gerrit-PatchSet: 1 Gerrit-Project: sink_nova_fixed_multi Gerrit-Branch: master Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits