X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Flib%2Fcommon.sh;h=7a91208d06cdf94e86f88fad747f663ab432cd28;hb=818ebd97b869309fefa0cc102ab0a9f067f9a51d;hp=f09ca6f31d053801e2a992d5a4b911d76ff32f60;hpb=43dbb5a2353606d1801f08dcf3e2fd06399843fb;p=icn.git

diff --git a/env/lib/common.sh b/env/lib/common.sh
index f09ca6f..7a91208 100755
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -2,6 +2,7 @@
 set -eu -o pipefail
 
 IRONIC_DATA_DIR=${IRONIC_DATA_DIR:-"/opt/ironic"}
+NODES_FILE=${NODES_FILE:-"${IRONIC_DATA_DIR}/nodes.json"}
 #IRONIC_PROVISIONING_INTERFACE is required to be provisioning, don't change it
 IRONIC_INTERFACE=${IRONIC_INTERFACE:-}
 IRONIC_PROVISIONING_INTERFACE=${IRONIC_PROVISIONING_INTERFACE:-"provisioning"}
@@ -81,8 +82,6 @@ function call_api {
 }
 
 function list_nodes {
-    NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
-
     if [ ! -f "$NODES_FILE" ]; then
         exit 1
     fi
@@ -123,12 +122,47 @@ function list_nodes {
     fi
 }
 
+function node_userdata {
+    name="$1"
+    username="$2"
+    password="$3"
+    COMPUTE_NODE_FQDN="$name.akraino.icn.org"
+
+    # validate that the user isn't expecting the deprecated
+    # COMPUTE_NODE_PASSWORD to be used
+    if [ "$password" != "${COMPUTE_NODE_PASSWORD:-$password}" ]; then
+        cat <<EOF
+COMPUTE_NODE_PASSWORD "$COMPUTE_NODE_PASSWORD" not equal to nodes.json $name password "$password".
+Unset COMPUTE_NODE_PASSWORD and retry.
+EOF
+        exit 1
+    fi
+
+    printf "userData:\n"
+    if [ -n "$username" ]; then
+	printf "  name: ${username}\n"
+    fi
+    if [ -n "$password" ]; then
+        passwd=$(mkpasswd --method=SHA-512 --rounds 4096 "$password")
+        printf "  hashedPassword: ${passwd}\n"
+    fi
+
+    if [ -n "$COMPUTE_NODE_FQDN" ]; then
+        printf "  fqdn: ${COMPUTE_NODE_FQDN}\n"
+    fi
+
+    if [ ! -f $HOME/.ssh/id_rsa.pub ]; then
+        yes y | ssh-keygen -t rsa -N "" -f $HOME/.ssh/id_rsa
+    fi
+
+    printf "  sshAuthorizedKey: $(cat $HOME/.ssh/id_rsa.pub)\n"
+}
+
 # Returns "null" when the field is not present
 function networkdata_networks_field {
     name=$1
     network=$2
     field=$3
-    NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
     cat $NODES_FILE | jq -c -r --arg name "$name" --arg network "$network" --arg field "$field" '.nodes[] | select(.name==$name) | .net.networks[] | select(.id==$network).'${field}
 }
 
@@ -137,15 +171,12 @@ function networkdata_links_field {
     name=$1
     link=$2
     field=$3
-    NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
     cat $NODES_FILE | jq -c -r --arg name "$name" --arg link "$link" --arg field "$field" '.nodes[] | select(.name==$name) | .net.links[] | select(.id==$link).'${field}
 }
 
 function node_networkdata {
     name=$1
 
-    NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
-
     if [ ! -f "$NODES_FILE" ]; then
         exit 1
     fi
@@ -190,6 +221,24 @@ function wait_for {
     done
 }
 
+# This is intended to be used together with list_nodes in the
+# following way:
+#   list_nodes | while IFS=',' read -r name ipmi_username ipmi_password ipmi_address boot_mac os_username os_password os_image_name; do ...
+function node_machine_values {
+    printf "machineName: ${name}\n"
+    printf "machineLabels:\n"
+    printf "  machine: ${name}\n"
+    printf "bmcUsername: ${ipmi_username}\n"
+    printf "bmcPassword: ${ipmi_password}\n"
+    printf "bmcAddress: ipmi://${ipmi_address}\n"
+    if [[ ! -z ${boot_mac} ]]; then
+        printf "bootMACAddress: ${boot_mac}\n"
+    fi
+    printf "imageName: ${BM_IMAGE}\n"
+    node_userdata ${name} ${os_username} ${os_password}
+    node_networkdata ${name}
+}
+
 function clone_repository {
     local -r path=$1
     local -r repo=$2