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/xci-deploy.sh | |
| 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/xci-deploy.sh')
| -rwxr-xr-x | xci/xci-deploy.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index e0b31ab9..99053c7e 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -22,7 +22,7 @@ submit_bug_report() { echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION" echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION" echo "xci flavor: $XCI_FLAVOR" - echo "xci nfvi: $XCI_NFVI" + echo "xci installer: $XCI_INSTALLER" echo "Environment variables:" env | grep --color=never '\(OPNFV\|XCI\|OPENSTACK\)' echo "-------------------------------------------------------------------------" @@ -59,8 +59,8 @@ source $XCI_PATH/xci/config/user-vars source $XCI_PATH/xci/config/pinned-versions # source flavor configuration source "$XCI_PATH/xci/config/${XCI_FLAVOR}-vars" -# source NFVI configuration -source "$XCI_PATH/xci/nfvi/${XCI_NFVI}/env" &>/dev/null || true +# source installer configuration +source "$XCI_PATH/xci/installer/${XCI_INSTALLER}/env" &>/dev/null || true # source xci configuration source $XCI_PATH/xci/config/env-vars @@ -87,7 +87,7 @@ echo "Info: Starting XCI Deployment" echo "Info: Deployment parameters" echo "-------------------------------------------------------------------------" echo "xci flavor: $XCI_FLAVOR" -echo "xci nfvi: $XCI_NFVI" +echo "xci installer: $XCI_INSTALLER" echo "opnfv/releng-xci version: $(git rev-parse HEAD)" echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION" echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION" @@ -173,9 +173,9 @@ echo "-----------------------------------------------------------------------" echo "Info: VM nodes are provisioned!" echo "-----------------------------------------------------------------------" -# Deploy OpenStack on the selected NFVI -echo "Info: Deploying '${XCI_NFVI}' NFVI" +# Deploy OpenStack on the selected installer +echo "Info: Deploying '${XCI_INSTALLER}' installer" echo "-----------------------------------------------------------------------" -source ${XCI_PATH}/xci/nfvi/${XCI_NFVI}/nfvi-deploy.sh +source ${XCI_PATH}/xci/installer/${XCI_INSTALLER}/deploy.sh # vim: set ts=4 sw=4 expandtab: |