X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fmetal3%2Fscripts%2Fmetal3.sh;h=1c8226032ab1c08d3f10591b3d67743899fb6ef5;hb=5885be79556efc50b6ee9e1c6e51a803095b9073;hp=b5ba5203888c3ae96bfcebda0321a1261557c465;hpb=618ced035cad7691b28ca606117568548893b26d;p=icn.git

diff --git a/deploy/metal3/scripts/metal3.sh b/deploy/metal3/scripts/metal3.sh
index b5ba520..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")")")"
 
@@ -9,6 +8,11 @@ BM_OPERATOR="${BM_OPERATOR:-https://github.com/metal3-io/baremetal-operator.git}
 
 source $LIBDIR/env/lib/common.sh
 
+if [[ $EUID -ne 0 ]]; then
+    echo "This script must be run as root"
+    exit 1
+fi
+
 function get_default_inteface_ipaddress() {
     local _ip=$1
     local _default_interface=$(awk '$2 == 00000000 { print $1 }' /proc/net/route)
@@ -55,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() {
@@ -94,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