update inventory and simplified

Author: ryanwclark

cloud-init/deploy.sh

@@ -38,7 +38,7 @@ clone_vm() {
     --target $node_name \
     --storage init
     exit
-  " > /dev/null
+  "
 }
 
 ask_to_intialize() {
@@ -57,7 +57,7 @@ ask_to_intialize() {
 
       case "$user_input" in
         y|yes)
-          source ./intialize.sh > /dev/null
+          source ./intialize.sh
           echo "Environment intialized."
           break
           ;;
@@ -142,9 +142,28 @@ for node in "${nodes[@]}"; do
     role=$(echo "$vm" | jq -r '.role')
     storage_disk_size=$(echo "$vm" | jq -r '.storage_disk_size')
     log_action "Cloning VM for $vm_name on $node_name ($node_ip) with ID $vm_id..."
-    clone_vm
+    ssh "$prox_user@$template_ip" <<EOF
+      qm clone $BASE_VM $vm_id \
+      --name $vm_name \
+      --full true \
+      --target $node_name \
+      --storage init
+      exit
+EOF
     log_action "Configuring VM on $node_ip..."
-    deploy_vm
+    ssh "$prox_user@$node_ip" bash <<EOF
+      qm set $vm_id --ipconfig0 ip=$vm_ip/$CIDR,gw=$GATEWAY;
+      qm set $vm_id --tags "$TAG,$role";
+      qm set $vm_id --cores "$cores" --sockets "$sockets" --memory "$memory";
+      qm disk move $vm_id scsi0 $disk --delete 1;
+      qm disk resize $vm_id scsi0 $disk_size;
+      temp_file=\$(mktemp -t tmp_key.XXX);
+      echo $SSH_KEY_TEXT > \$temp_file;
+      cat ~/.ssh/id_rsa.pub >> \$temp_file;
+      qm set $vm_id --sshkey \$temp_file;
+      rm \$temp_file;
+      exit
+EOF
     if [ -n "$storage_disk_size" ] && [ "$storage_disk_size" != "null" ]; then
       storage_disk_size=$(echo $storage_disk_size | tr -d '[:alpha:]');
       ssh "$prox_user@$node_ip" bash <<EOF

inventory.json

@@ -19,7 +19,7 @@
           "name": "k3s-node01",
           "ip": "10.10.101.221",
           "id": 221,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,
@@ -37,7 +37,7 @@
           "name": "k3s-node02",
           "ip": "10.10.101.222",
           "id": 222,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,
@@ -48,7 +48,7 @@
           "name": "k3s-node07",
           "ip": "10.10.101.227",
           "id": 227,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,
@@ -59,7 +59,7 @@
           "name": "k3s-node08",
           "ip": "10.10.101.228",
           "id": 228,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,
@@ -89,7 +89,7 @@
           "name": "k3s-node03",
           "ip": "10.10.101.223",
           "id": 223,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,
@@ -100,7 +100,7 @@
           "name": "k3s-node09",
           "ip": "10.10.101.229",
           "id": 229,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,
@@ -111,7 +111,7 @@
           "name": "k3s-node10",
           "ip": "10.10.101.230",
           "id": 230,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,
@@ -141,7 +141,7 @@
           "name": "k3s-node04",
           "ip": "10.10.101.224",
           "id": 224,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,
@@ -152,7 +152,7 @@
           "name": "k3s-node11",
           "ip": "10.10.101.231",
           "id": 231,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,
@@ -163,7 +163,7 @@
           "name": "k3s-node12",
           "ip": "10.10.101.232",
           "id": 232,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,
@@ -193,7 +193,7 @@
           "name": "k3s-node05",
           "ip": "10.10.101.225",
           "id": 225,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 2,
@@ -204,7 +204,7 @@
           "name": "k3s-node13",
           "ip": "10.10.101.233",
           "id": 233,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 2,
@@ -215,7 +215,7 @@
           "name": "k3s-node14",
           "ip": "10.10.101.234",
           "id": 234,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 2,
@@ -233,7 +233,7 @@
           "name": "k3s-node06",
           "ip": "10.10.101.226",
           "id": 226,
-          "disk_size": "10G" ,
+          "disk_size": "10G",
           "disk": "tank",
           "cores": 4,
           "sockets": 1,