x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V3: update the nova API with the metadataproxy secret"

Browse Source
This commit is contained in:
Jenkins 2016-08-06 20:41:29 +00:00 committed by Gerrit Code Review
commit 25ba1bad59
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/lib/vmware_nsx_v3
View File

@ -76,6 +76,13 @@ function neutron_plugin_create_nova_conf {
setup_integration_bridge
iniset $NOVA_CONF neutron ovs_bridge $OVS_BRIDGE
fi
# if n-api is enabled, then setup the metadata_proxy_shared_secret
if is_service_enabled n-api; then
if [[ "$NATIVE_DHCP_METADATA" == "True" ]]; then
iniset $NOVA_CONF neutron metadata_proxy_shared_secret $METADATA_PROXY_SHARED_SECRET
iniset $NOVA_CONF neutron service_metadata_proxy True
fi
fi
}
function neutron_plugin_install_agent_packages {
@ -162,8 +169,6 @@ function neutron_plugin_configure_service {
_nsxv3_ini_set dhcp_profile_uuid $DHCP_PROFILE_UUID
_nsxv3_ini_set metadata_proxy_uuid $METADATA_PROXY_UUID
iniset $NEUTRON_CONF DEFAULT dhcp_agent_notification False
iniset $NEUTRON_META_CONF DEFAULT metadata_proxy_shared_secret $METADATA_PROXY_SHARED_SECRET
iniset $NOVA_CONF neutron service_metadata_proxy True
fi
}