From 1a55c01bca8576db029f0bfeeaf1d93c14999e1b Mon Sep 17 00:00:00 2001 From: Artom Lifshitz Date: Fri, 3 Apr 2020 19:30:32 -0400 Subject: [PATCH] Do not install whitebox twice Setting TEMPEST_PLUGINS is enough for devstack to install whitebox for us. There is no need to install it ourselves in our devstack plugin. Change-Id: I8446b54dd1e8ca1551e3064006576190564deeac --- devstack/plugin.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 52e484b2..e8b79d76 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -1,10 +1,5 @@ #!/bin/sh -function install { - echo_summary "Installing whitebox-tempest-plugin" - setup_dev_lib "whitebox-tempest-plugin" -} - function configure { echo_summary "Configuring whitebox-tempest-plugin options" iniset $TEMPEST_CONFIG whitebox ctlplane_ssh_username $STACK_USER @@ -28,9 +23,7 @@ function configure { if [[ "$1" == "stack" ]]; then if is_service_enabled tempest; then - if [[ "$2" == "install" ]]; then - install - elif [[ "$2" == "test-config" ]]; then + if [[ "$2" == "test-config" ]]; then configure fi fi