X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Flib%2Fcommon.sh;h=af54d237462701ba9e1b890412093350c493b114;hb=00ee6025d0bcd56f5a55f06c76c97cc864534b20;hp=a6a6c4b560d1325077952526fa73f609a426d240;hpb=994f7224dbd6ab85016e9aad4fb47ee39890406d;p=icn.git

diff --git a/env/lib/common.sh b/env/lib/common.sh
index a6a6c4b..af54d23 100755
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -6,7 +6,6 @@ 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"}
-IRONIC_IPMI_INTERFACE=${IRONIC_IPMI_INTERFACE:-}
 IRONIC_PROVISIONING_INTERFACE_IP=${IRONIC_PROVISIONING_INTERFACE_IP:-"172.22.0.1"}
 BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"}
 BM_IMAGE=${BM_IMAGE:-"focal-server-cloudimg-amd64.img"}
@@ -16,6 +15,8 @@ BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
 #Path to clone the baremetal operator repo
 BMOPATH="/opt/src/github.com/metal3-io/baremetal-operator"
 #Bare Metal Operator version to use
+#  If changing this, the value in deploy/ironic/icn/kustomization.yaml
+#  must also be changed
 BMO_VERSION="capm3-v0.5.1"
 
 #KuD repository URL
@@ -23,17 +24,17 @@ KUDREPO="${KUDREPO:-https://github.com/onap/multicloud-k8s.git}"
 #Path to clone the KuD repo
 KUDPATH="/opt/src/github.com/onap/multicloud-k8s"
 #KuD version to use
-KUD_VERSION="ed96bca7fe415f1636d82c26af15d7474bdfe876"
+KUD_VERSION="8157bf63753839ce4e9006978816fad3f63ca2de"
 
 #EMCO repository URL
-EMCOREPO="${EMCOREPO:-https://github.com/open-ness/EMCO.git}"
+EMCOREPO="${EMCOREPO:-https://gitlab.com/project-emco/core/emco-base.git}"
 #Path to clone the EMCO repo
-EMCOPATH="/opt/src/github.com/open-ness/EMCO"
+EMCOPATH="/opt/src/emco-base"
 #EMCO version to use
-EMCO_VERSION="openness-21.03.06"
+EMCO_VERSION="v21.12"
 
 #Discard existing repo directory
-FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-true}"
+FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-false}"
 
 # The kustomize version to use
 KUSTOMIZE_VERSION="v4.3.0"
@@ -45,7 +46,7 @@ CAPI_VERSION="v0.4.3"
 CAPM3_VERSION="v0.5.1"
 
 #The flux version to use
-FLUX_VERSION="0.20.0"
+FLUX_VERSION="0.25.3"
 
 #The sops version to use
 SOPS_VERSION="v3.7.1"
@@ -122,6 +123,42 @@ 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
@@ -185,6 +222,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
@@ -219,40 +274,6 @@ function clone_emco_repository {
     clone_repository ${EMCOPATH} ${EMCOREPO} ${EMCO_VERSION}
 }
 
-function install_kustomize {
-    curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" -o kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
-    tar xzf kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz --no-same-owner
-    sudo install -o root -g root -m 0755 kustomize /usr/local/bin/kustomize
-    rm kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz kustomize
-    kustomize version
-}
-
-function install_clusterctl {
-    curl -L https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/clusterctl-linux-amd64 -o clusterctl
-    sudo install -o root -g root -m 0755 clusterctl /usr/local/bin/clusterctl
-    rm clusterctl
-    clusterctl version
-}
-
-function install_flux_cli {
-    export FLUX_VERSION
-    curl -s https://fluxcd.io/install.sh | sudo -E bash
-    flux --version
-}
-
-function install_emcoctl {
-    clone_emco_repository
-    make -C ${EMCOPATH}/src/tools/emcoctl
-    sudo install -o root -g root -m 0755 ${EMCOPATH}/bin/emcoctl/emcoctl /usr/local/bin/emcoctl
-}
-
-function install_sops {
-    curl -L https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux -o sops
-    sudo install -o root -g root -m 0755 sops /usr/local/bin/sops
-    rm sops
-    sops --version
-}
-
 function fetch_image {
     if [[ "${BM_IMAGE_URL}" && "${BM_IMAGE}" ]]; then
        mkdir -p "${IRONIC_DATA_DIR}/html/images"