x
/
group-based-policy
Code Issues Proposed changes

Set IPV4_ADDRS_SAFE_TO_USE for gate job config 

This should help with a gate failure where IPV4_ADDRS_SAFE_TO_USE
is not set and results in job failing with the following error:

'Could not determine host ip address. See local.conf for suggestions on
setting HOST_IP.'

Change-Id: I38195ef56593a42d2d81c697254125c75b7cfc9d
This commit is contained in:
Sumit Naiksatam 2018-01-08 11:51:36 -08:00
parent d649785c9e
commit 34febe6fb5
3 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gbpservice/tests/contrib/functions-gbp
View File

@ -5,6 +5,7 @@ NEW_BASE="$BASE/new"
SCRIPTS_DIR="/usr/os-testr-env/bin"
LOGS_DIR="$NEW_BASE/logs"
ARCHIVE_LOGS_DIR="$BASE/logs"
LOCAL_CONF=$TOP_DIR/local.conf
# The following config is legacy and is used for GBP non-devstack plugin
# install
@ -38,9 +39,17 @@ function prepare_gbp_devstack_post {
source $TOP_DIR/functions-common
}
function append_to_localconf {
# REVISIT: Instead of using the subnet directly here, ideally we
# should be doing something similar to what is being done in here:
# https://github.com/openstack/neutron/commit/96a821c48b7de0017d00c43a3f9da91585873354
sudo sed -i "$ a IPV4_ADDRS_SAFE_TO_USE=10.1.0.0/20" $TOP_DIR/local.conf
}
function prepare_gbp_devstack {
prepare_gbp_devstack_pre
sudo mv $GBP_DIR/devstack/local-gbp.conf $TOP_DIR/local.conf
append_to_localconf
sudo cp -r $CONTRIB_DIR/devstack/gbp-templates $TOP_DIR
sudo cp $CONTRIB_DIR/devstack/exercises/*.sh $TOP_DIR/exercises/
prepare_gbp_devstack_post
@ -49,6 +58,7 @@ function prepare_gbp_devstack {
function prepare_nfp_devstack {
cd $TOP_DIR
sudo cp $CONTRIB_DIR/devstack/local-nfp.conf $TOP_DIR/local.conf
append_to_localconf
sudo rm -rf $TOP_DIR/exercises/*.sh
sudo cp $CONTRIB_DIR/devstack/exercises-nfp/*.sh $TOP_DIR/exercises/
#sudo cp $CONTRIB_DIR/devstack/exercises-nfp/lb.sh $TOP_DIR/exercises/
@ -63,6 +73,7 @@ function prepare_nfp_devstack {
function prepare_gbp_aim_devstack {
prepare_gbp_devstack_pre
sudo cp $CONTRIB_DIR/devstack/local-aim.conf $TOP_DIR/local.conf
append_to_localconf
sudo cp $CONTRIB_DIR/devstack/exercises-aim/gbp_aim.sh $TOP_DIR/exercises/
# Use the aim version of the shared PRS test
sudo mv $GBP_FUNC_DIR/testcases/tc_gbp_prs_pr_shared_func.py.aim $GBP_FUNC_DIR/testcases/tc_gbp_prs_pr_shared_func.py
@ -129,5 +140,6 @@ function check_residual_resources {
neutron router-list
neutron net-list
neutron subnet-list
neutron subnetpool-list
neutron port-list
}

16
gbpservice/tests/contrib/gate_aim_hook.sh
View File

@ -8,9 +8,6 @@ set -x
trap prepare_logs ERR
# Make the workspace owned by the stack user
sudo chown -R $STACK_USER:$STACK_USER $BASE
# temporary fix for bug 1693689
export IPV4_ADDRS_SAFE_TO_USE=${DEVSTACK_GATE_IPV4_ADDRS_SAFE_TO_USE:-${DEVSTACK_GATE_FIXED_RANGE:-10.1.0.0/20}}
@ -24,16 +21,3 @@ disable_service postgresql
enable_service mysql
initialize_database_backends
install_database
# Set up the 'openstack_citest' user and database in each backend
tmp_dir=`mktemp -d`
cat << EOF > $tmp_dir/mysql.sql
CREATE DATABASE openstack_citest;
CREATE USER 'openstack_citest'@'localhost' IDENTIFIED BY 'openstack_citest';
CREATE USER 'openstack_citest' IDENTIFIED BY 'openstack_citest';
GRANT ALL PRIVILEGES ON *.* TO 'openstack_citest'@'localhost';
GRANT ALL PRIVILEGES ON *.* TO 'openstack_citest';
FLUSH PRIVILEGES;
EOF
/usr/bin/mysql -u root < $tmp_dir/mysql.sql

16
gbpservice/tests/contrib/gate_hook.sh
View File

@ -8,9 +8,6 @@ set -x
trap prepare_logs ERR
# Make the workspace owned by the stack user
sudo chown -R $STACK_USER:$STACK_USER $BASE
# temporary fix for bug 1693689
export IPV4_ADDRS_SAFE_TO_USE=${DEVSTACK_GATE_IPV4_ADDRS_SAFE_TO_USE:-${DEVSTACK_GATE_FIXED_RANGE:-10.1.0.0/20}}
@ -24,16 +21,3 @@ disable_service postgresql
enable_service mysql
initialize_database_backends
install_database
# Set up the 'openstack_citest' user and database in each backend
tmp_dir=`mktemp -d`
cat << EOF > $tmp_dir/mysql.sql
CREATE DATABASE openstack_citest;
CREATE USER 'openstack_citest'@'localhost' IDENTIFIED BY 'openstack_citest';
CREATE USER 'openstack_citest' IDENTIFIED BY 'openstack_citest';
GRANT ALL PRIVILEGES ON *.* TO 'openstack_citest'@'localhost';
GRANT ALL PRIVILEGES ON *.* TO 'openstack_citest';
FLUSH PRIVILEGES;
EOF
/usr/bin/mysql -u root < $tmp_dir/mysql.sql