X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fmetal3%2Fscripts%2Fmetal3.sh;h=1c8226032ab1c08d3f10591b3d67743899fb6ef5;hb=8330617f383937e05971ece1bee97673bd0c8fc6;hp=f268d8bd0e6d3fb3719482a3c3f0b50ef76d9e2e;hpb=5a43320c3d1ab1958e137e9db4c99976a6f164da;p=icn.git

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