From a19cf619b0ca81db662b1167a94350f6c72c8220 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Wed, 21 Dec 2016 09:53:06 -0500 Subject: Updating ENV var names to better reflect what they point to - Also removing a stale file Change-Id: Ice2f9b4f9961bcd7f05278f11995aa0af237ac8e Signed-off-by: Dan Radez --- lib/overcloud-deploy-functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/overcloud-deploy-functions.sh') diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 216fa6c6..cf9abcfb 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -55,15 +55,15 @@ function overcloud_deploy { # Make sure the correct overcloud image is available - if [ ! -f $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then - echo "${red} $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 is required to execute your deployment." + if [ ! -f $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then + echo "${red} $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 is required to execute your deployment." echo "Please install the opnfv-apex package to provide this overcloud image for deployment.${reset}" exit 1 fi echo "Copying overcloud image to Undercloud" ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "rm -f overcloud-full.qcow2" - scp ${SSH_OPTIONS[@]} $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 "stack@$UNDERCLOUD":overcloud-full.qcow2 + scp ${SSH_OPTIONS[@]} $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 "stack@$UNDERCLOUD":overcloud-full.qcow2 # Install ovs-dpdk inside the overcloud image if it is enabled. if [[ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' || "${deploy_options_array['dataplane']}" == 'fdio' ]]; then -- cgit 1.2.3-korg