From b7c0066de509b3eb2e1264966eff12cff49472e1 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Thu, 30 Mar 2017 23:37:32 -0400 Subject: Moving undercloud root pw to debug only Change-Id: I380d39b6c78519487dec3b053c53a9579df57f06 Signed-off-by: Dan Radez (cherry picked from commit 035c80d52a780125ba84d1bc5f8232c9ff2a4a17) --- build/undercloud.sh | 1 - lib/undercloud-functions.sh | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/undercloud.sh b/build/undercloud.sh index e3194e2b..de96f029 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -67,7 +67,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install "openstack-heat-api" \ --upload ${BUILD_ROOT}/patches/0001-Removes-doing-yum-update.patch:/usr/lib/python2.7/site-packages/ \ --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < 0001-Removes-doing-yum-update.patch" \ - --root-password password:stack \ -a undercloud_build.qcow2 mv -f undercloud_build.qcow2 undercloud.qcow2 diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh index 2a370bff..7108dcf5 100755 --- a/lib/undercloud-functions.sh +++ b/lib/undercloud-functions.sh @@ -55,6 +55,10 @@ function setup_undercloud_vm { # if the VM is not running update the authkeys and start it if ! virsh list | grep undercloud > /dev/null; then + if [ "$debug" == 'TRUE' ]; then + LIBGUESTFS_BACKEND=direct virt-customize -a $undercloud_dst --root-password password:opnfvapex + fi + echo "Injecting ssh key to Undercloud VM" LIBGUESTFS_BACKEND=direct virt-customize -a $undercloud_dst --run-command "mkdir -p /root/.ssh/" \ --upload ~/.ssh/id_rsa.pub:/root/.ssh/authorized_keys \ -- cgit 1.2.3-korg