openstack/charm-neutron-api
Code Issues Proposed changes

Addresed David's comments

Browse Source
This commit is contained in:
sunny.verma@nuagenetworks.net 2016-02-26 18:23:35 -05:00
parent 3d1e4882b0
commit 0967ec59d3
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/neutron_api_context.py
View File

@ -194,7 +194,8 @@ class NeutronCCContext(context.NeutronContext):
vsd_ip = rdata.get('vsd-ip-address')
if os_release('neutron-server') >= 'kilo':
cms_id_value = rdata.get('nuage-cms-id')
log('relation data:cms_id: {}'.format(cms_id_value))
log('relation data:cms_id required for'
' nuage plugin: {}'.format(cms_id_value))
if cms_id_value is not None:
ctxt['cms_id'] = '{}'.format(cms_id_value)
log('relation data:vsd-ip-address: {}'.format(vsd_ip))

1
hooks/neutron_api_hooks.py
View File

@ -210,7 +210,6 @@ def install():
@hooks.hook('vsd-rest-api-relation-joined')
@restart_on_change(restart_map(), stopstart=True)
# @os_requires_version('kilo', 'neutron-server')
def relation_set_nuage_cms_name(rid=None):
if os_release('neutron-server') >= 'kilo':
if config('vsd-cms-name') is None:

1
templates/kilo/nuage_plugin.ini
View File

@ -1,4 +1,3 @@
# icehouse
###############################################################################
# [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten.