openstack
/
tricircle
Code Issues Proposed changes

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
This commit is contained in:
zhiyuan_cai 2016-07-08 11:16:07 +08:00
parent 0aae30fc4d
commit bfe02339b3
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -160,12 +160,6 @@ function configure_tricircle_nova_apigw {
init_common_tricircle_conf $TRICIRCLE_NOVA_APIGW_CONF 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 setup_colorized_logging $TRICIRCLE_NOVA_APIGW_CONF DEFAULT tenant_name
if is_service_enabled keystone; then if is_service_enabled keystone; then

4
tricircle/tempestplugin/post_test_hook.sh
View File

@ -21,7 +21,7 @@ export TRICIRCLE_TEMPEST_PLUGIN_DIR=$TRICIRCLE_DIR/tricircle/tempestplugin
export TEMPEST_DIR=$DEST/tempest export TEMPEST_DIR=$DEST/tempest
# use admin role to create Tricircle top Pod and Pod1 # 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}') token=$(openstack token issue | awk 'NR==5 {print $4}')
echo $token echo $token
@ -40,7 +40,7 @@ cd $TEMPEST_DIR
if [ -d .testrepository ]; then if [ -d .testrepository ]; then
sudo rm -r .testrepository sudo rm -r .testrepository
fi fi
testr init # sudo -H -u jenkins testr init
# Run the Compute Tempest tests # Run the Compute Tempest tests
# cd $TRICIRCLE_TEMPEST_PLUGIN_DIR # cd $TRICIRCLE_TEMPEST_PLUGIN_DIR

9
tricircle/tempestplugin/tempest_volume.sh
View File

@ -25,6 +25,15 @@ cd $TEMPEST_DIR
# Import functions needed for the below workaround # Import functions needed for the below workaround
source $DEST/devstack/functions 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 # change the configruation to test Tricircle Cinder-APIGW
iniset $TEMPEST_CONF volume region RegionOne iniset $TEMPEST_CONF volume region RegionOne
iniset $TEMPEST_CONF volume catalog_type volumev2 iniset $TEMPEST_CONF volume catalog_type volumev2