openstack/devstack
Code Issues Proposed changes

Neutron refactor: Clarify use of neutron-metadata-agent

Browse Source 
The commit message of 2a242519f71e86416e78541826cac2b54fcd04a5 indicated
that neutron-metadata-agent was the correct name for the metadata
proxy, but parts of the code were not consistent.

Change-Id: I52f08266a169aeb9005c0f84296fc814d05b90d4
This commit is contained in:
Sean M. Collins 2016-05-11 15:07:19 -04:00
parent 4bb4728e6f
commit 1cd2828da4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/neutron
View File

@ -204,7 +204,7 @@ function configure_neutron_new {
fi fi
# Metadata # Metadata
if is_service_enabled neutron-meta; then if is_service_enabled neutron-metadata-agent; then
cp $NEUTRON_DIR/etc/metadata_agent.ini.sample $NEUTRON_META_CONF cp $NEUTRON_DIR/etc/metadata_agent.ini.sample $NEUTRON_META_CONF
iniset $NEUTRON_META_CONF DEFAULT verbose True iniset $NEUTRON_META_CONF DEFAULT verbose True
@ -290,7 +290,7 @@ function configure_neutron_nova_new {
iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
if is_service_enabled neutron-meta; then if is_service_enabled neutron-metadata-agent; then
iniset $NOVA_CONF neutron service_metadata_proxy "True" iniset $NOVA_CONF neutron service_metadata_proxy "True"
fi fi
@ -425,8 +425,8 @@ function start_neutron_new {
create_neutron_initial_network create_neutron_initial_network
fi fi
fi fi
if is_service_enabled neutron-meta; then if is_service_enabled neutron-metadata-agent; then
run_process neutron-meta "$NEUTRON_BIN_DIR/$NEUTRON_META_BINARY $NEUTRON_CONFIG_ARG" run_process neutron-metadata-agent "$NEUTRON_BIN_DIR/$NEUTRON_META_BINARY $NEUTRON_CONFIG_ARG"
fi fi
} }
@ -442,9 +442,9 @@ function stop_neutron_new {
[ ! -z "$pid" ] && sudo kill -9 $pid [ ! -z "$pid" ] && sudo kill -9 $pid
fi fi
if is_service_enabled neutron-meta; then if is_service_enabled neutron-metadata-agent; then
sudo pkill -9 -f neutron-ns-metadata-proxy || : sudo pkill -9 -f neutron-ns-metadata-proxy || :
stop_process neutron-meta stop_process neutron-metadata-agent
fi fi
} }
@ -470,7 +470,7 @@ function _set_config_files {
NEUTRON_CONFIG_ARG+=" --config-file $NEUTRON_L3_CONF" NEUTRON_CONFIG_ARG+=" --config-file $NEUTRON_L3_CONF"
fi fi
if is_service_enabled neutron-meta; then if is_service_enabled neutron-metadata-agent; then
NEUTRON_CONFIG_ARG+=" --config-file $NEUTRON_META_CONF" NEUTRON_CONFIG_ARG+=" --config-file $NEUTRON_META_CONF"
fi fi