[fuel] Retire 'virtual_kvm' override 71/51271/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 28 Jan 2018 20:07:12 +0000 (21:07 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 28 Jan 2018 20:07:12 +0000 (21:07 +0100)
Now that vPDF support landed in Pharos and Fuel repos, disable the
'virtual_kvm' generic override, so we can load POD-specific PDF/IDF.

JIRA: FUEL-322

Change-Id: I0964220a25d6fe30afcbeb3ad1f020ae76d38e5a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
jjb/fuel/fuel-deploy.sh

index cb9febe..7fe10c6 100755 (executable)
@@ -49,10 +49,6 @@ LAB_CONFIG_URL=${LAB_CONFIG_URL:-'ssh://jenkins-ericsson@gerrit.opnfv.org:29418/
 # Fuel requires deploy script to be ran with sudo, Armband does not
 SUDO='sudo -E'
 if [ "${PROJECT}" = 'fuel' ]; then
-    # Fuel does not use any POD-specific configuration for virtual deploys
-    if [[ "${NODE_NAME}" =~ "virtual" ]]; then
-        POD_NAME="virtual_kvm"
-    fi
     # Fuel currently supports ericsson, intel, lf and zte labs
     if [[ ! "${LAB_NAME}" =~ (ericsson|intel|lf|zte) ]]; then
         echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!"