summaryrefslogtreecommitdiffstats
path: root/prototypes/xci/config
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-06-01 14:11:23 +0100
committerMarkos Chandras <mchandras@suse.de>2017-06-01 14:15:11 +0100
commit4864e179604366bb096f3dcd5b3fe64158b97d1d (patch)
treebba698999917907f832a5b8ad81e0b77c899df91 /prototypes/xci/config
parent30c08f92e136ac84fbc05d1cadf78c2c80ddd000 (diff)
prototypes: xci: Make CLEAN_DIB_IMAGES variable configurable
The CLEAN_DIB_IMAGES variable determines whether the /httpboot or /tftpboot directories will be removed before running the xci-deploy script. This forces XCI to re-create the target OS images. We moved this variable from env-vars to user-vars since this is something that users normally want to tweak in their deployments. Change-Id: Ia48bd63979e3837aab7e47c906c2501e7c7dd0e1 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'prototypes/xci/config')
-rwxr-xr-xprototypes/xci/config/env-vars1
-rwxr-xr-xprototypes/xci/config/user-vars2
2 files changed, 2 insertions, 1 deletions
diff --git a/prototypes/xci/config/env-vars b/prototypes/xci/config/env-vars
index cefb412a6..9d4c78258 100755
--- a/prototypes/xci/config/env-vars
+++ b/prototypes/xci/config/env-vars
@@ -6,7 +6,6 @@ export OPNFV_RELENG_GIT_URL=https://gerrit.opnfv.org/gerrit/releng.git
export OPENSTACK_BIFROST_GIT_URL=https://git.openstack.org/openstack/bifrost
export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansible
export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy
-export CLEAN_DIB_IMAGES=false
export OPNFV_HOST_IP=192.168.122.2
export XCI_FLAVOR_ANSIBLE_FILE_PATH=$OPNFV_RELENG_PATH/prototypes/xci/file/$XCI_FLAVOR
export CI_LOOP=${CI_LOOP:-daily}
diff --git a/prototypes/xci/config/user-vars b/prototypes/xci/config/user-vars
index f9de940a2..5ed539627 100755
--- a/prototypes/xci/config/user-vars
+++ b/prototypes/xci/config/user-vars
@@ -54,3 +54,5 @@ export OPNFV_OSA_PLAYBOOK=${OPNFV_OSA_PLAYBOOK:-"$OPENSTACK_OSA_PATH/playbooks/s
export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY-""}
export LOG_PATH=${LOG_PATH:-${XCI_DEVEL_ROOT}/opnfv/logs}
export RUN_TEMPEST=${RUN_TEMPEST:-false}
+# Set this to to true to force XCI to re-create the target OS images
+export CLEAN_DIB_IMAGES=${CLEAN_DIB_IMAGES:-false}