Merge pull request #19 from iranzo/nclusters

N clusters creation

Author: alknopfler

hack/deploy-hub-local/build.sh

@@ -7,7 +7,6 @@ set -m
 
 # variables
 # #########
-export CLUSTERS=$1
 export DEPLOY_OCP_DIR="./"
 export OC_AMORGANT_PULL_SECRET='"{"auths": ... }"'
 export OC_RELEASE="quay.io/openshift-release-dev/ocp-release:4.9.0-x86_64"
@@ -17,29 +16,34 @@ export OC_NET_CLASS="ipv4"
 export OC_TYPE_ENV="connected"
 export VERSION="ci"
 
-if [ $# -ne 1 ] ; then
-    echo "Usage: $0 <clusters>"
+if [ $1 != "" ]; then
+    export CLUSTERS=$1
+else
+    export CLUSTERS=0
+fi
+
+# Only complain when there's less than one cluster
+if [ ${CLUSTERS} -lt 0 ]; then
+    echo "Usage: $0 <# of clusters>"
     exit 1
 fi
 
 echo ">>>> Set the Pull Secret"
 echo ">>>>>>>>>>>>>>>>>>>>>>>>"
 
-echo $OC_AMORGANT_PULL_SECRET | tr -d [:space:] | sed -e 's/^.//' -e 's/.$//' > ./openshift_pull.json
-
+echo $OC_AMORGANT_PULL_SECRET | tr -d [:space:] | sed -e 's/^.//' -e 's/.$//' >./openshift_pull.json
 
 echo ">>>> kcli create plan"
 echo ">>>>>>>>>>>>>>>>>>>>>"
 
-
 if [ "$OC_DEPLOY_METAL" = "yes" ]; then
-    if [ "$OC_NET_CLASS" = "ipv4"  ]; then
-        if [ "$OC_TYPE_ENV" = "connected" ] ; then
+    if [ "$OC_NET_CLASS" = "ipv4" ]; then
+        if [ "$OC_TYPE_ENV" = "connected" ]; then
             echo "Metal3 + Ipv4 + connected"
             t=$(echo "$OC_RELEASE" | awk -F: '{print $2}')
             kcli create network --nodhcp --domain kubeframe -c 192.168.7.0/24 kubeframe
             kcli create plan --force --paramfile=lab-metal3.yml -P disconnected="false" -P version="$VERSION" -P tag="$t" -P openshift_image="$OC_RELEASE" -P cluster="$OC_CLUSTER_NAME" "$OC_CLUSTER_NAME"
-            kcli create plan -k -f create-vm.yml  -P clusters="$CLUSTERS" "$OC_CLUSTER_NAME"
+            kcli create plan -k -f create-vm.yml -P clusters="$CLUSTERS" "$OC_CLUSTER_NAME"
 
         else
             echo "Metal3 + ipv4 + disconnected"
@@ -53,19 +57,41 @@ if [ "$OC_DEPLOY_METAL" = "yes" ]; then
 
     fi
 else
-   echo "Without Metal3 + ipv4 + connected"
-   kcli create kube openshift --force --paramfile lab-withoutMetal3.yml -P tag="$OC_RELEASE" -P cluster="$OC_CLUSTER_NAME" "$OC_CLUSTER_NAME"
+    echo "Without Metal3 + ipv4 + connected"
+    kcli create kube openshift --force --paramfile lab-withoutMetal3.yml -P tag="$OC_RELEASE" -P cluster="$OC_CLUSTER_NAME" "$OC_CLUSTER_NAME"
 fi
 
-IP=$(kcli info vm test-ci-installer|grep ip|awk '{print $2}')
-SPOKE1_0=$(kcli info vm spoke1-m0|grep id|awk '{print $2}')
-SPOKE1_1=$(kcli info vm spoke1-m1|grep id|awk '{print $2}')
-SPOKE1_2=$(kcli info vm spoke1-m2|grep id|awk '{print $2}')
+# Spokes.yaml file generation
+
+#Empty file before we start
+
+>spokes.yaml
+
+CHANGE_IP=$(kcli info vm test-ci-installer | grep ip | awk '{print $2}')
+
+for spoke in $(seq 0 $((CLUSTERS - 1))); do
+    cat <<EOF >>spokes.yaml
+  - spoke$spoke-cluster:
+EOF
+    for master in 0 1 2; do
+        # Stanza generation for each master
+        MASTER=$(kcli info vm spoke${spoke}-m${master} | grep id | awk '{print $2}')
+        cat <<EOF >>spokes.yaml
+      master${master}:
+        nic_ext_dhcp: enp1s0
+        nic_int_static: enp2s0
+        mac_ext_dhcp: "ee:ee:ee:ee:${master}${spoke}:${master}e"
+        mac_int_static: "aa:aa:aa:aa:${master}${spoke}:${master}a"
+        bmc_url: "redfish-virtualmedia+http://$CHANGE_IP:8000/redfish/v1/Systems/$MASTER"
+        bmc_user: "amorgant"
+        bmc_pass: "alknopfler"
+EOF
+    done
 
-sed -e "s/CHANGE_IP/$IP/g" -e "s/CHANGE_ID_0/$SPOKE1_0/g" -e "s/CHANGE_ID_1/$SPOKE1_1/g" -e "s/CHANGE_ID_2/$SPOKE1_2/g" ./spokes-orig.yaml > ./spokes.yaml
+done
 
 kcli create dns -n bare-net httpd-server.apps.test-ci.alklabs.com -i 192.168.150.252
 kcli create dns -n bare-net kubeframe-registry-kubeframe-registry.apps.test-ci.alklabs.com -i 192.168.150.252
 
 echo ">>>> EOF"
-echo ">>>>>>>>"
+echo ">>>>>>>>"

hack/deploy-hub-local/create-vm.yml

@@ -10,10 +10,10 @@ spoke{{ i }}-m{{ j }}:
   numcpus: 8
   nets:
   - name: bare-net
-    mac: ee:ee:ee:ee:ee:{{ j }}e
+    mac: ee:ee:ee:ee:{{ j }}{{ i }}:{{ j }}e
   - name: kubeframe
     nic: enp2s0
-    mac: aa:aa:aa:aa:aa:{{ j }}a
+    mac: aa:aa:aa:aa:{{ j }}{{ i }}:{{ j }}a
   disks:
   - size: 200
   - size: 200