From b3c6090a4098fcf1c907f6ae7c67448370cc8d65 Mon Sep 17 00:00:00 2001
From: Kuralamudhan Ramakrishnan <kuralamudhan.ramakrishnan@intel.com>
Date: Sat, 17 Aug 2019 01:12:20 -0700
Subject: [PATCH] adding bug fixes in kud and metal3 script

Change-Id: I2ac99d944ad542282267b29ed5b7482767a74616
---
 deploy/kud/kud_launch.sh        | 2 +-
 deploy/metal3/scripts/metal3.sh | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/deploy/kud/kud_launch.sh b/deploy/kud/kud_launch.sh
index 85adc6e..d7be23c 100755
--- a/deploy/kud/kud_launch.sh
+++ b/deploy/kud/kud_launch.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ ! -d $(PWD)/multicloud-k8s]; then
+if [ ! -d $PWD/multicloud-k8s ]; then
 	git clone https://github.com/onap/multicloud-k8s.git
 fi
 
diff --git a/deploy/metal3/scripts/metal3.sh b/deploy/metal3/scripts/metal3.sh
index f268d8b..1c82260 100755
--- a/deploy/metal3/scripts/metal3.sh
+++ b/deploy/metal3/scripts/metal3.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -ex
 
 LIBDIR="$(dirname "$(dirname "$(dirname "$PWD")")")"
 
@@ -60,7 +59,7 @@ provision_compute_node() {
 	printf "\n  userData:" >> $COMPUTE_NODE_NAME-bm-node.yaml
 	printf "\n    name: ""%s" "$COMPUTE_NODE_NAME""-user-data" >> $COMPUTE_NODE_NAME-bm-node.yaml
 	printf "\n    namespace: metal3\n" >> $COMPUTE_NODE_NAME-bm-node.yaml
-	kubectl apply -f $COMPUTE_NODE_NAME-bm-node.yaml
+	kubectl apply -f $COMPUTE_NODE_NAME-bm-node.yaml -n metal3
 }
 
 deprovision_compute_node() {
@@ -99,10 +98,10 @@ create_userdata() {
 		printf "fqdn: ""%s" "$COMPUTE_NODE_FQDN" >> userdata.yaml
 		printf "\n" >> userdata.yaml
 	fi
-
+	printf "disable_root: false\n" >> userdata.yaml
 	printf "ssh_authorized_keys:\n  - " >> userdata.yaml
 
-	if [ -f $HOME/.ssh/id_rsa.pub ]; then
+	if [ ! -f $HOME/.ssh/id_rsa.pub ]; then
 		yes y | ssh-keygen -t rsa -N "" -f $HOME/.ssh/id_rsa
 	fi
 
-- 
2.16.6