diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-01-08 10:52:57 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-01-08 23:24:10 +0000 |
| commit | 5eaa9da62dabbf31fc83f0c43c6bc56f68468f9c (patch) | |
| tree | e04ab5e994f5f35a6164ef0f0ce527c2d9012739 /xci/config | |
| parent | b4a0a044240a09e621f51d1f12f8f02148870c39 (diff) | |
xci: Rename 'nfvi' to 'installer'
Using 'installer' to describe the tool that will deploy the foundations
of a particular XCI scenario is more appropriate than NFVI which
normally describes both the physical and virtual resources needed by
an NFV deployment.
Change-Id: Ib8b1aac58673bf705ce2ff053574fd10cb390d71
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/env-vars | 2 | ||||
| -rwxr-xr-x | xci/config/user-vars | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index b4a40165..c7744ca1 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -8,7 +8,7 @@ export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansib export OPENSTACK_OSA_OPENRC_GIT_URL=https://git.openstack.org/openstack/openstack-ansible-openstack_openrc export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy export OPNFV_HOST_IP=192.168.122.2 -export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/nfvi/$XCI_NFVI/files/$XCI_FLAVOR +export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/installer/$XCI_INSTALLER/files/$XCI_FLAVOR export CI_LOOP=${CI_LOOP:-daily} export JOB_NAME=${JOB_NAME:-false} # XCI_CACHE is a cache on localhost where repositories and scenarios are cloned. diff --git a/xci/config/user-vars b/xci/config/user-vars index da3528f4..64f2882b 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -23,7 +23,7 @@ export XCI_FLAVOR=${XCI_FLAVOR:-aio} export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; echo ${ID,,})} export XCI_CEPH_ENABLED=${XCI_CEPH_ENABLED:-false} -export XCI_NFVI=${XCI_NFVI:-osa} +export XCI_INSTALLER=${XCI_INSTALLER:-osa} #------------------------------------------------------------------------------- # Configure some other stuff |