openstack/devstack
Code Issues Proposed changes

Merge "Add neutron-metering agent and configuration"

Browse Source
This commit is contained in:
Jenkins 2016-06-15 00:59:27 +00:00 committed by Gerrit Code Review
commit 45360ed32e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/neutron
View File

@ -240,6 +240,13 @@ function configure_neutron_new {
iniset $NEUTRON_CONF DEFAULT ssl_key_file "$NEUTRON_SSL_KEY" iniset $NEUTRON_CONF DEFAULT ssl_key_file "$NEUTRON_SSL_KEY"
fi fi
# Metering
if is_service_enabled neutron-metering; then
source $TOP_DIR/neutron_plugins/services/metering
neutron_agent_metering_configure_common
neutron_agent_metering_configure_agent
fi
} }
# configure_neutron_rootwrap() - configure Neutron's rootwrap # configure_neutron_rootwrap() - configure Neutron's rootwrap
@ -426,6 +433,10 @@ function start_neutron_new {
if is_service_enabled neutron-metadata-agent; then if is_service_enabled neutron-metadata-agent; then
run_process neutron-metadata-agent "$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
if is_service_enabled neutron-metering; then
run_process neutron-metering "$AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME"
fi
} }
# stop_neutron() - Stop running processes (non-screen) # stop_neutron() - Stop running processes (non-screen)