summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh3
-rwxr-xr-xutils/infra_setup/heat_template/HOT_create_instance.sh5
2 files changed, 6 insertions, 2 deletions
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh b/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
index 9bad405e..692af416 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
@@ -8,7 +8,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-set -e
+set -ex
RELENG_REPO=https://gerrit.opnfv.org/gerrit/releng
RELENG_REPO_DIR=/tmp/opnfvrepo/releng
@@ -47,3 +47,4 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
fi
export EXTERNAL_NET INSTALLER_TYPE POD_NAME
+set +ex
diff --git a/utils/infra_setup/heat_template/HOT_create_instance.sh b/utils/infra_setup/heat_template/HOT_create_instance.sh
index d9e09a98..c6c1fe3a 100755
--- a/utils/infra_setup/heat_template/HOT_create_instance.sh
+++ b/utils/infra_setup/heat_template/HOT_create_instance.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-set -e
+set -ex
bottlenecks_create_instance()
{
@@ -106,6 +106,7 @@ main()
PUBLIC_NET_NAME=net04_ext
#need FIX
#IMAGE_FILE_NAME=""
+ source $BOTTLENECKS_REPO_DIR/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
#bottlenecks_cleanup
#bottlenecks_build_image
@@ -114,3 +115,5 @@ main()
}
main
+set +ex
+