Merge "Allow to use project_name in handler formats"
This commit is contained in:
commit
328424a7be
|
@ -67,6 +67,8 @@ class NeutronFloatingHandler(BaseAddressHandler):
|
||||||
'version': 4,
|
'version': 4,
|
||||||
'address': payload['floatingip']['floating_ip_address']
|
'address': payload['floatingip']['floating_ip_address']
|
||||||
}
|
}
|
||||||
|
payload['floatingip']['project'] = getattr(
|
||||||
|
context, 'tenant', None)
|
||||||
self._create(addresses=[address],
|
self._create(addresses=[address],
|
||||||
extra=payload['floatingip'],
|
extra=payload['floatingip'],
|
||||||
zone_id=zone_id,
|
zone_id=zone_id,
|
||||||
|
|
|
@ -62,6 +62,7 @@ class NovaFixedHandler(BaseAddressHandler):
|
||||||
|
|
||||||
zone_id = cfg.CONF[self.name].zone_id
|
zone_id = cfg.CONF[self.name].zone_id
|
||||||
if event_type == 'compute.instance.create.end':
|
if event_type == 'compute.instance.create.end':
|
||||||
|
payload['project'] = getattr(context, 'tenant', None)
|
||||||
self._create(addresses=payload['fixed_ips'],
|
self._create(addresses=payload['fixed_ips'],
|
||||||
extra=payload,
|
extra=payload,
|
||||||
zone_id=zone_id,
|
zone_id=zone_id,
|
||||||
|
|
|
@ -399,6 +399,7 @@ debug = False
|
||||||
#notification_topics = notifications
|
#notification_topics = notifications
|
||||||
#control_exchange = 'nova'
|
#control_exchange = 'nova'
|
||||||
#format = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(domain)s'
|
#format = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(domain)s'
|
||||||
|
#format = '%(hostname)s.%(project)s.%(domain)s'
|
||||||
#format = '%(hostname)s.%(domain)s'
|
#format = '%(hostname)s.%(domain)s'
|
||||||
|
|
||||||
#------------------------
|
#------------------------
|
||||||
|
@ -410,6 +411,7 @@ debug = False
|
||||||
#notification_topics = notifications
|
#notification_topics = notifications
|
||||||
#control_exchange = 'neutron'
|
#control_exchange = 'neutron'
|
||||||
#format = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(domain)s'
|
#format = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(domain)s'
|
||||||
|
#format = '%(hostname)s.%(project)s.%(domain)s'
|
||||||
#format = '%(hostname)s.%(domain)s'
|
#format = '%(hostname)s.%(domain)s'
|
||||||
|
|
||||||
#############################
|
#############################
|
||||||
|
|
Loading…
Reference in New Issue