a52041cd3f
Module lib/neutron was introduced long time ago as new module to deploy neutron. It was intended to replace old lib/neutron-legacy module. But since very long time it wasn't really finished and used by anyone and lib/neutron-legacy is defacto standard module used by everyone to deploy neutron with devstack. In [1] unfinished lib/neutron was deprecated and now it's time to remove it from the devstack code. This patch also renames old "lib/neutron-legacy" module to be "lib/neutron" now. Previously "old" lib/neutron-legacy module was accepting neutron services names wit "q-" prefix and "new" lib/neutron module was accepting services with "neutron-" prefix. Now, as there is only one module it accepts both prefixes. For historical reasons and to be consistent with old lib/neutron-legacy which was widely used everywhere, services will be named with "q-" prefix but both prefixes will be accepted to enable or disable services. This patch also moves _configure_neutron_service function to be called at the end of the "configure_neutron" after all agents and service plugins are already configured. [1] https://review.opendev.org/c/openstack/devstack/+/823653 Related-bug: #1996748 Change-Id: Ibf1c8b2ee6b6618f77cd8486e9c687993d7cb4a0
34 lines
820 B
Bash
34 lines
820 B
Bash
#!/bin/bash
|
|
|
|
# Neutron metering plugin
|
|
# ---------------------------
|
|
|
|
# Save trace setting
|
|
_XTRACE_NETURON_METER=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
|
|
AGENT_METERING_BINARY="$NEUTRON_BIN_DIR/neutron-metering-agent"
|
|
METERING_PLUGIN="neutron.services.metering.metering_plugin.MeteringPlugin"
|
|
|
|
function neutron_agent_metering_configure_common {
|
|
neutron_service_plugin_class_add $METERING_PLUGIN
|
|
}
|
|
|
|
function neutron_agent_metering_configure_agent {
|
|
METERING_AGENT_CONF_PATH=/etc/neutron/services/metering
|
|
mkdir -p $METERING_AGENT_CONF_PATH
|
|
|
|
METERING_AGENT_CONF_FILENAME="$METERING_AGENT_CONF_PATH/metering_agent.ini"
|
|
|
|
cp $NEUTRON_DIR/etc/metering_agent.ini.sample $METERING_AGENT_CONF_FILENAME
|
|
}
|
|
|
|
function neutron_metering_stop {
|
|
stop_process q-metering
|
|
}
|
|
|
|
# Restore xtrace
|
|
$_XTRACE_NETURON_METER
|
|
|