summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-03-30 23:37:32 -0400
committerDan Radez <dradez@redhat.com>2017-03-30 23:39:49 -0400
commitb7c0066de509b3eb2e1264966eff12cff49472e1 (patch)
treeb6ad4b460e63098c196be12cb80bec69015ccd8b
parent55427ec21a17cd601a4abb2cab4de4694ba1a702 (diff)
Moving undercloud root pw to debug onlydanube.1.0
Change-Id: I380d39b6c78519487dec3b053c53a9579df57f06 Signed-off-by: Dan Radez <dradez@redhat.com> (cherry picked from commit 035c80d52a780125ba84d1bc5f8232c9ff2a4a17)
-rwxr-xr-xbuild/undercloud.sh1
-rwxr-xr-xlib/undercloud-functions.sh4
2 files changed, 4 insertions, 1 deletions
diff --git a/build/undercloud.sh b/build/undercloud.sh
index e3194e2..de96f02 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 2a370bf..7108dcf 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 \