diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-03-12 14:34:18 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-03-12 13:44:03 +0000 |
| commit | 797efff8b6772b606f65822fbae6edfda35be0d2 (patch) | |
| tree | 28e435f0e9d8150451d225c626c151d6e914456b /xci/xci-deploy.sh | |
| parent | cea2e3355bc6b5c059349c6c3ca2e96d214cbfb4 (diff) | |
Combine vars setting installer type in INSTALLER_TYPE
Change-Id: I330bc036f901d4ba61bc94ee6e085cadf54b4d8b
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'xci/xci-deploy.sh')
| -rwxr-xr-x | xci/xci-deploy.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 77d12535..053c12d1 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -22,10 +22,10 @@ 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 installer: $XCI_INSTALLER" + echo "xci installer: $INSTALLER_TYPE" echo "xci scenario: $DEPLOY_SCENARIO" echo "Environment variables:" - env | grep --color=never '\(OPNFV\|XCI\|OPENSTACK\|SCENARIO\)' + env | grep --color=never '\(OPNFV\|XCI\|INSTALLER_TYPE\|OPENSTACK\|SCENARIO\)' echo "-------------------------------------------------------------------------" } @@ -61,7 +61,7 @@ source $XCI_PATH/xci/config/pinned-versions # source flavor configuration source "$XCI_PATH/xci/config/${XCI_FLAVOR}-vars" # source installer configuration -source "$XCI_PATH/xci/installer/${XCI_INSTALLER}/env" &>/dev/null || true +source "$XCI_PATH/xci/installer/${INSTALLER_TYPE}/env" &>/dev/null || true # source xci configuration source $XCI_PATH/xci/config/env-vars @@ -88,7 +88,7 @@ echo "Info: Starting XCI Deployment" echo "Info: Deployment parameters" echo "-------------------------------------------------------------------------" echo "xci flavor: $XCI_FLAVOR" -echo "xci installer: $XCI_INSTALLER" +echo "xci installer: $INSTALLER_TYPE" echo "opnfv/releng-xci version: $(git rev-parse HEAD)" echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION" echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION" @@ -145,9 +145,9 @@ echo "Info: VM nodes are provisioned!" echo "-----------------------------------------------------------------------" # Deploy OpenStack on the selected installer -echo "Info: Deploying '${XCI_INSTALLER}' installer" +echo "Info: Deploying '${INSTALLER_TYPE}' installer" echo "-----------------------------------------------------------------------" -source ${XCI_PATH}/xci/installer/${XCI_INSTALLER}/deploy.sh +source ${XCI_PATH}/xci/installer/${INSTALLER_TYPE}/deploy.sh # Deployment time xci_deploy_time=$SECONDS |