From bfe02339b34cfe83a4efcad436edadfe71656d55 Mon Sep 17 00:00:00 2001
From: zhiyuan_cai <luckyvega.g@gmail.com>
Date: Fri, 8 Jul 2016 11:16:07 +0800
Subject: [PATCH] Fix DevStack script error

1. What is the problem
When running DevStack script of the Tricircle, during the setup
of Nova_apigw, script tries to add some configuration options to
the Neutron configuration file. However this file doesn't exist
at that time, thus script fails.

2. What is the solution to the problem
Stop modifying the Neutron configuration file during the setup
of Nova_apigw. Instead, we modify that file during the setup
of Neutron server.

3. What the features need to be implemented to the Tricircle
   to realize the solution
No new features. Some lines of scripts are removed.

Change-Id: I94ada1e5a49f14942fa4c00690cffe2a87428e75
---
 devstack/plugin.sh                        | 6 ------
 tricircle/tempestplugin/post_test_hook.sh | 4 ++--
 tricircle/tempestplugin/tempest_volume.sh | 9 +++++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 18f4638..1dfba81 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -160,12 +160,6 @@ function configure_tricircle_nova_apigw {
 
         init_common_tricircle_conf $TRICIRCLE_NOVA_APIGW_CONF
 
-        iniset $NEUTRON_CONF client admin_username admin
-        iniset $NEUTRON_CONF client admin_password $ADMIN_PASSWORD
-        iniset $NEUTRON_CONF client admin_tenant demo
-        iniset $NEUTRON_CONF client auto_refresh_endpoint True
-        iniset $NEUTRON_CONF client top_pod_name $REGION_NAME
-
         setup_colorized_logging $TRICIRCLE_NOVA_APIGW_CONF DEFAULT tenant_name
 
         if is_service_enabled keystone; then
diff --git a/tricircle/tempestplugin/post_test_hook.sh b/tricircle/tempestplugin/post_test_hook.sh
index b646acc..56293b8 100755
--- a/tricircle/tempestplugin/post_test_hook.sh
+++ b/tricircle/tempestplugin/post_test_hook.sh
@@ -21,7 +21,7 @@ export TRICIRCLE_TEMPEST_PLUGIN_DIR=$TRICIRCLE_DIR/tricircle/tempestplugin
 export TEMPEST_DIR=$DEST/tempest
 
 # use admin role to create Tricircle top Pod and Pod1
-source $DEVSTACK_DIR/admin-openrc.sh
+source $BASE/new/devstack/openrc admin admin
 
 token=$(openstack token issue | awk 'NR==5 {print $4}')
 echo $token
@@ -40,7 +40,7 @@ cd $TEMPEST_DIR
 if [ -d .testrepository ]; then
   sudo rm -r .testrepository
 fi
-testr init
+# sudo -H -u jenkins testr init
 
 # Run the Compute Tempest tests
 # cd $TRICIRCLE_TEMPEST_PLUGIN_DIR
diff --git a/tricircle/tempestplugin/tempest_volume.sh b/tricircle/tempestplugin/tempest_volume.sh
index 717a979..bd3aebe 100755
--- a/tricircle/tempestplugin/tempest_volume.sh
+++ b/tricircle/tempestplugin/tempest_volume.sh
@@ -25,6 +25,15 @@ cd $TEMPEST_DIR
 # Import functions needed for the below workaround
 source $DEST/devstack/functions
 
+# add account information to configuration
+source $BASE/new/devstack/openrc admin admin
+env | grep OS_
+iniset $TEMPEST_CONF auth admin_username admin
+iniset $TEMPEST_CONF auth admin_project_name admin
+iniset $TEMPEST_CONF auth admin_password $OS_PASSWORD
+iniset $TEMPEST_CONF identity uri $OS_AUTH_URL
+iniset $TEMPEST_CONF identity-feature-enabled api_v3 false
+
 # change the configruation to test Tricircle Cinder-APIGW
 iniset $TEMPEST_CONF volume region RegionOne
 iniset $TEMPEST_CONF volume catalog_type volumev2