summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Higgins <derekh@redhat.com>2018-09-19 22:23:22 +0100
committerDerek Higgins <derekh@redhat.com>2018-09-21 10:12:13 +0100
commitd2a653da30d09cf92c2ab9f9d2752d919176f6c1 (patch)
tree14d9020064506ebee7bffa8da74c8528f3e19676
parent9fa0acce4a8816fe87611da1075d2da3ddbd637f (diff)
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
Notes
Notes (review): Code-Review+2: Dmitry Tantsur <divius.inside@gmail.com> Code-Review+2: Sam Betts <sam@code-smash.net> Workflow+1: Sam Betts <sam@code-smash.net> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 21 Sep 2018 13:34:49 +0000 Reviewed-on: https://review.openstack.org/603920 Project: openstack/networking-generic-switch Branch: refs/heads/master
-rwxr-xr-xdevstack/upgrade/upgrade.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index f7dda43..a2e7569 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -68,6 +68,10 @@ stack_install_service generic_switch
68# calls upgrade-networking-generic-switch for specific release 68# calls upgrade-networking-generic-switch for specific release
69upgrade_project networking-generic-switch $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH 69upgrade_project networking-generic-switch $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH
70 70
71# Also set in grenade but isn't picked up
72AGENT_METERING_BINARY=${AGENT_METERING_BINARY:-"$NEUTRON_BIN_DIR/neutron-metering-agent"}
73METERING_AGENT_CONF_FILENAME=${METERING_AGENT_CONF_FILENAME:-"/etc/neutron/services/metering/metering_agent.ini"}
74
71# NOTE(vsaienko) restart neutron to use new networking-generic-switch 75# NOTE(vsaienko) restart neutron to use new networking-generic-switch
72neutron_server_config_add ${GENERIC_SWITCH_INI_FILE} 76neutron_server_config_add ${GENERIC_SWITCH_INI_FILE}
73stop_neutron 77stop_neutron