summaryrefslogtreecommitdiffstats
path: root/docker/prepare_env.sh
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-02-02 08:45:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-02 08:45:43 +0000
commita0ecc366c97cc66a2120a39987b909d30af141da (patch)
tree07862339d187ce30a4c3651238487e46fccbaabd /docker/prepare_env.sh
parent81d7877b7f124f393c929e3a862e64125218e945 (diff)
parent47635924e6def36be3c44a047d91018e47a439eb (diff)
Merge "Use generate_defaults instead of os_defaults fixed parameters"
Diffstat (limited to 'docker/prepare_env.sh')
-rwxr-xr-xdocker/prepare_env.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 4106e3bde..ea82ea1c0 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -221,7 +221,7 @@ if [ $RETVAL -ne 0 ]; then
fi
# Prepare Functest Environment
-info "Functest: prepare Functest environment"
+info "Preparing Functest environment..."
python ${FUNCTEST_REPO_DIR}/testcases/config_functest.py --debug start
retval=$?
if [ $retval != 0 ]; then
@@ -229,6 +229,12 @@ if [ $retval != 0 ]; then
exit $retval
fi
+
+# Generate OpenStack defaults
+info "Generating OpenStack defaults..."
+python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py -d
+
+
ifconfig eth0 mtu 1450
echo "1" > ${FUNCTEST_CONF_DIR}/env_active