From 5c9e135ccc5867ebf26bbe594cbd9964582a237d Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Mon, 8 Aug 2016 10:41:05 -0400
Subject: Fixes no root pw on perf images

Bug where root password was not being set on overcloud nodes when perf
options were specified in deploy settings.

JIRA: APEX-224

Change-Id: I14b8240f40d5901aabdd53814143e0fa002df92b
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 lib/overcloud-deploy-functions.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index e613dae0..2d352321 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -105,6 +105,10 @@ EOI
     exit 1
   fi
 
+  if [ "$debug" == 'TRUE' ]; then
+    ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex"
+  fi
+
   # Set ODL version accordingly
   if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['odl_version']}" == 'boron' ]]; then
     ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
@@ -208,10 +212,6 @@ EOI
   echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}"
 
   ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-if [ "$debug" == 'TRUE' ]; then
-    LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex
-fi
-
 if [ "${deploy_options_array['tacker']}" == 'False' ]; then
     sed -i '/EnableTacker:/c\  EnableTacker: false' opnfv-environment.yaml
 fi
-- 
cgit 1.2.3-korg