Browse Source

Set config filename for neutron-metering

Required now for the grenade jobs as they have switched
over to using this script since rocky has been released.
Task: #26593

Story: #2003808
Change-Id: Ib7d68d1360e3cdbfdc2ff185a9760461e75ac8c4
Derek Higgins 7 months ago
parent
commit
d2a653da30
1 changed files with 4 additions and 0 deletions
  1. 4
    0
      devstack/upgrade/upgrade.sh

+ 4
- 0
devstack/upgrade/upgrade.sh View File

@@ -68,6 +68,10 @@ stack_install_service generic_switch
68 68
 # calls upgrade-networking-generic-switch for specific release
69 69
 upgrade_project networking-generic-switch $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH
70 70
 
71
+# Also set in grenade but isn't picked up
72
+AGENT_METERING_BINARY=${AGENT_METERING_BINARY:-"$NEUTRON_BIN_DIR/neutron-metering-agent"}
73
+METERING_AGENT_CONF_FILENAME=${METERING_AGENT_CONF_FILENAME:-"/etc/neutron/services/metering/metering_agent.ini"}
74
+
71 75
 # NOTE(vsaienko) restart neutron to use new networking-generic-switch
72 76
 neutron_server_config_add ${GENERIC_SWITCH_INI_FILE}
73 77
 stop_neutron

Loading…
Cancel
Save