Merge lp:~billy-olsen/charm-helpers/add-dns-domain into lp:charm-helpers

Proposed by Billy Olsen
Status: Merged
Merged at revision: 739
Proposed branch: lp:~billy-olsen/charm-helpers/add-dns-domain
Merge into: lp:charm-helpers
Diff against target: 14 lines (+4/-0)
1 file modified
charmhelpers/contrib/openstack/context.py (+4/-0)
To merge this branch: bzr merge lp:~billy-olsen/charm-helpers/add-dns-domain
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+323447@code.launchpad.net

Description of the change

Add dns-domain key to the NeutronAPIContext

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py 2017-04-26 09:46:19 +0000
+++ charmhelpers/contrib/openstack/context.py 2017-05-01 05:18:51 +0000
@@ -1393,6 +1393,10 @@
1393 'rel_key': 'enable-l3ha',1393 'rel_key': 'enable-l3ha',
1394 'default': False,1394 'default': False,
1395 },1395 },
1396 'dns_domain': {
1397 'rel_key': 'dns-domain',
1398 'default': None,
1399 },
1396 }1400 }
1397 ctxt = self.get_neutron_options({})1401 ctxt = self.get_neutron_options({})
1398 for rid in relation_ids('neutron-plugin-api'):1402 for rid in relation_ids('neutron-plugin-api'):

Subscribers

People subscribed via source and target branches