From 54accd42b3ec23d6fdbf87b79048f378dabf6839 Mon Sep 17 00:00:00 2001 From: Kaitlin Farr Date: Tue, 23 May 2017 13:12:59 -0400 Subject: [PATCH] DevStack plugin set tempest options in test-config section TEMPEST_CONFIG options should be set in the test-config section, otherwise they get overridden. Also adds the creator role to the tempest user. Change-Id: I6816c1b699e140600e5bb47a251cd0788125f8d0 (cherry picked from commit eb18c70d3b10f9e1898526ca6d04d5c20ec75836) --- devstack/plugin.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 157d5052..3be87c33 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -1,6 +1,7 @@ # Configure the needed tempest options function configure_barbican_tempest() { iniset $TEMPEST_CONFIG service_available barbican True + iniset $TEMPEST_CONFIG auth tempest_roles creator } # check for service enabled @@ -44,15 +45,16 @@ if is_service_enabled barbican; then elif [[ "$1" == "stack" && "$2" == "extra" ]]; then echo_summary "Initializing Barbican" init_barbican - if is_service_enabled tempest; then - echo_summary "Configuring Tempest options for Barbican" - configure_barbican_tempest - fi start_barbican if is_service_enabled pykmip-server; then echo_summary "Starting PyKMIP server" start_pykmip fi + elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then + if is_service_enabled tempest; then + echo_summary "Configuring Tempest options for Barbican" + configure_barbican_tempest + fi fi if [[ "$1" == "unstack" ]]; then