diff options
author | Markos Chandras <mchandras@suse.de> | 2017-06-01 14:11:23 +0100 |
---|---|---|
committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-11 12:56:12 -0700 |
commit | abb18dd0a68b57b1f2921f4ce1fbddd4d91477cc (patch) | |
tree | c199e38181464b57cc2be61a9edebcd8f9ea4248 /xci | |
parent | 0b7b98ff7121304fe0cb558790a0b82533ff1d69 (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 'xci')
-rwxr-xr-x | xci/config/env-vars | 1 | ||||
-rwxr-xr-x | xci/config/user-vars | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index cefb412a..9d4c7825 100755 --- a/xci/config/env-vars +++ b/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/xci/config/user-vars b/xci/config/user-vars index f9de940a..5ed53962 100755 --- a/xci/config/user-vars +++ b/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} |