bash best practices, loop change, parameterization of many things

.gitignore

@@ -2,3 +2,7 @@
 typescript
 *~
 *.secret
+variables.yml
+vault.yml
+*.swp
+hosts.lab

1-create-jump.sh

@@ -2,36 +2,83 @@
 
 source ./env.sh
 
-if [ ! -d $VMS ]
-then
-    echo "Creating $VMS"
-    mkdir -p $VMS
+# verify a bunch of variables have contents, as a sanity check
+if [ ! -v VMS ]; then
+	echo "${VMS} is not defined. Please set this in env.sh and try again."
+	exit 1
+fi
+if [ ! -v CLUSTERKEY ]; then
+	echo "${CLUSTERKEY} is not defined. Please set this in env.sh and try again."
+	exit 2
+fi
+if [ ! -v ORIGINALKEY ]; then
+	echo "${ORIGINALKEY} is not defined. Please set this in env.sh and try again."
+	exit 3
+fi
+if [ ! -v VMROOTDISK ]; then
+	echo "${VMROOTDISK} is not defined. Please set this in env.sh and try again."
+	exit 4
+fi
+if [ ! -v INITIALPASSWD ]; then
+	echo "${INITIALPASSWD} is not defined. Please set this in env.sh and try again."
+	exit 5
 fi
 
-for i in `cat hosts.jump|grep -v \\\\[`;
-do 
+HOSTSFILE=hosts.jump
+if [ ! -r "$HOSTSFILE" ]; then
+	echo "${HOSTSFILE} is missing."
+	exit 10
+fi
 
-    echo "########################################################################"
-    echo "[$i start]"
+# create the VM directory if it doesn't exist
+if [ ! -d "$VMS" ]; then
+    echo "Creating ${VMS}"
+    mkdir -p "$VMS"
+fi
 
-    baseimage="$VMS/$i-base.qcow2"
-    image="$VMS/$i.qcow2"
-    dockerdisk="$VMS/$i-docker.qcow2"
-    glusterfsdisk="$VMS/$i-glusterfs.qcow2"
+# sanity checks around the ssh key stuff
+if [ ! -f "$CLUSTERKEY" ]; then # if the cluster sshkey doesn't exist, try to copy it from the original key
+	if [ ! -r "$ORIGINALKEY" ]; then # check to see if the original key exists and is readable
+		echo "${CLUSTERKEY} does not exist, and ${ORIGINALKEY} can't be found/read."
+		exit 6
+	fi
 
-    echo "[Creating a $VMROOTDISK disk for root, $image]"
-    qemu-img create -f qcow2 $baseimage $VMROOTDISK
-    virt-resize --expand /dev/sda1 $RHEL_IMAGE $baseimage
+	# if CLUSTERKEY doesn't exist, but the ORIGINALKEY does, copy it. 
+	cp "$ORIGINALKEY" "$CLUSTERKEY"
+	COPYRESULT=$?
+	if [ "$COPYRESULT" -ne 0 ]; then
+		echo "Error: Copying ${ORIGINALKEY} to create ${CLUSTERKEY} failed with: ${COPYRESULT}"
+		exit 7
+	fi
+fi
+if [ ! -r "$CLUSTERKEY" ]; then # bomb out if the cluster sshkey isn't readable
+	echo "${CLUSTERKEY} is missing, or is not readbale. Exiting now."
+	exit 8
+fi
 
-    qemu-img create -f qcow2 -b $baseimage $image
+# ensure that the permissions are correct for the new cluster key
+chmod 644 "$CLUSTERKEY"
 
-    echo "[Customizing $i system]"
-    virt-customize -a $image --run-command 'yum remove cloud-init* -y'
-    virt-customize -a $image --root-password password:redhat
-    virt-customize -a $image --ssh-inject root:file:$WORKSPACE/vm_id_rsa.pub
-    virt-customize -a $image --hostname "$i"
-    echo "[$i done]"
+# a safer, cleaner loop over the hosts file to read in lines, rather than words
+grep -E '^[^\[ ]' < $HOSTSFILE | while IFS= read -r i
+do 
+    echo "########################################################################"
+    echo "[${i} start]"
 
-done
+    BASEIMAGE="${VMS}/${i}-base.qcow2"
+    IMAGE="${VMS}/${i}.qcow2"
+    DOCKERDISK="${VMS}/${i}-docker.qcow2"
+    GLUSTERFSDISK="${VMS}/${i}-glusterfs.qcow2"
+
+    echo "[Creating a ${VMROOTDISK} disk for root, ${IMAGE}]"
+    qemu-img create -f qcow2 "$BASEIMAGE" "$VMROOTDISK"
+    virt-resize --expand /dev/sda1 "$RHEL_IMAGE" "$BASEIMAGE"
+    qemu-img create -f qcow2 -b "$BASEIMAGE" "$IMAGE"
 
-exit
+    echo "[Customizing ${i} system]"
+    virt-customize -a "$IMAGE" --run-command 'yum remove cloud-init* -y'
+    virt-customize -a "$IMAGE" --root-password password:"$INITIALPASSWD"
+    virt-customize -a "$IMAGE" --ssh-inject root:file:"$CLUSTERKEY"
+    virt-customize -a "$IMAGE" --hostname "$i"
+    echo "[${i} done]"
+done

1-create-node.sh

@@ -2,42 +2,89 @@
 
 source ./env.sh
 
-if [ ! -d $VMS ]
-then
-    echo "Creating $VMS"
-    mkdir -p $VMS
+# verify a bunch of variables have contents, as a sanity check
+if [ ! -v VMS ]; then
+	echo "${VMS} is not defined. Please set this in env.sh and try again."
+	exit 1
+fi
+if [ ! -v CLUSTERKEY ]; then
+	echo "${CLUSTERKEY} is not defined. Please set this in env.sh and try again."
+	exit 2
+fi
+if [ ! -v ORIGINALKEY ]; then
+	echo "${ORIGINALKEY} is not defined. Please set this in env.sh and try again."
+	exit 3
+fi
+if [ ! -v VMROOTDISK ]; then
+	echo "${VMROOTDISK} is not defined. Please set this in env.sh and try again."
+	exit 4
+fi
+if [ ! -v INITIALPASSWD ]; then
+	echo "${INITIALPASSWD} is not defined. Please set this in env.sh and try again."
+	exit 5
 fi
 
-for i in `cat hosts.addnode|grep -v \\\\[`;
-do 
+HOSTSFILE=hosts.addnode
+if [ ! -r "$HOSTSFILE" ]; then
+	echo "${HOSTSFILE} is missing."
+	exit 10
+fi
 
-    echo "########################################################################"
-    echo "[$i start]"
+# create the VM directory if it doesn't exist
+if [ ! -d "$VMS" ]; then
+    echo "Creating ${VMS}"
+    mkdir -p "$VMS"
+fi
 
-    baseimage="$VMS/$i-base.qcow2"
-    image="$VMS/$i.qcow2"
-    dockerdisk="$VMS/$i-docker.qcow2"
-    glusterfsdisk="$VMS/$i-glusterfs.qcow2"
+# sanity checks around the ssh key stuff
+if [ ! -f "$CLUSTERKEY" ]; then # if the cluster sshkey doesn't exist, try to copy it from the original key
+	if [ ! -r "$ORIGINALKEY" ]; then # check to see if the original key exists and is readable
+		echo "${CLUSTERKEY} does not exist, and ${ORIGINALKEY} can't be found/read."
+		exit 6
+	fi
 
-    echo "[Creating a $VMROOTDISK disk for root, $image]"
-    qemu-img create -f qcow2 $baseimage $VMROOTDISK
-    virt-resize --expand /dev/sda1 $RHEL_IMAGE $baseimage
+	# if CLUSTERKEY doesn't exist, but the ORIGINALKEY does, copy it. 
+	cp "$ORIGINALKEY" "$CLUSTERKEY"
+	COPYRESULT=$?
+	if [ "$COPYRESULT" -ne 0 ]; then
+		echo "Error: Copying ${ORIGINALKEY} to create ${CLUSTERKEY} failed with: ${COPYRESULT}"
+		exit 7
+	fi
+fi
+if [ ! -r "$CLUSTERKEY" ]; then # bomb out if the cluster sshkey isn't readable
+	echo "${CLUSTERKEY} is missing, or is not readbale. Exiting now."
+	exit 8
+fi
 
-    qemu-img create -f qcow2 -b $baseimage $image
+# ensure that the permissions are correct for the new cluster key
+chmod 644 "$CLUSTERKEY"
 
-    echo "[Creating a $VMDOCKERDISK disk for docker, $dockerdisk]"
-    qemu-img create -f raw $dockerdisk $VMDOCKERDISK
+# a safer, cleaner loop over the hosts file to read in lines, rather than words
+grep -E '^[^\[ ]' < $HOSTSFILE | while IFS= read -r i
+do 
+    echo "########################################################################"
+    echo "[${i} start]"
 
-    echo "[Creating a $VMGLUSTERFSDISK disk for glusterfs, $glusterfsdisk]"
-    qemu-img create -f raw $glusterfsdisk $VMGLUSTERFSDISK
+    BASEIMAGE="${VMS}/${i}-base.qcow2"
+    IMAGE="${VMS}/${i}.qcow2"
+    DOCKERDISK="${VMS}/${i}-docker.qcow2"
+    GLUSTERFSDISK="${VMS}/${i}-glusterfs.qcow2"
 
-    echo "[Customizing $i system]"
-    virt-customize -a $image --run-command 'yum remove cloud-init* -y'
-    virt-customize -a $image --root-password password:redhat
-    virt-customize -a $image --ssh-inject root:file:$WORKSPACE/vm_id_rsa.pub
-    virt-customize -a $image --hostname "$i"
-    echo "[$i done]"
+    echo "[Creating a ${VMROOTDISK} disk for root, ${IMAGE}]"
+    qemu-img create -f qcow2 "$BASEIMAGE" "$VMROOTDISK"
+    virt-resize --expand /dev/sda1 "$RHEL_IMAGE" "$BASEIMAGE"
+    qemu-img create -f qcow2 -b "$BASEIMAGE" "$IMAGE"
 
-done
+    echo "[Creating a ${VMDOCKERDISK} disk for docker, ${DOCKERDISK}]"
+    qemu-img create -f raw "$DOCKERDISK" "$VMDOCKERDISK"
+
+    echo "[Creating a ${VMGLUSTERFSDISK} disk for glusterfs, ${GLUSTERFSDISK}]"
+    qemu-img create -f raw "$GLUSTERFSDISK" "$VMGLUSTERFSDISK"
 
-exit
+    echo "[Customizing ${i} system]"
+    virt-customize -a "$IMAGE" --run-command 'yum remove cloud-init* -y'
+    virt-customize -a "$IMAGE" --root-password password:"$INITIALPASSWD"
+    virt-customize -a "$IMAGE" --ssh-inject root:file:"$CLUSTERKEY"
+    virt-customize -a "$IMAGE" --hostname "$i"
+    echo "[${i} done]"
+done

1-create.sh

@@ -2,42 +2,89 @@
 
 source ./env.sh
 
-if [ ! -d $VMS ]
-then
-    echo "Creating $VMS"
-    mkdir -p $VMS
+# verify a bunch of variables have contents, as a sanity check
+if [ ! -v VMS ]; then
+	echo "${VMS} is not defined. Please set this in env.sh and try again."
+	exit 1
+fi
+if [ ! -v CLUSTERKEY ]; then
+	echo "${CLUSTERKEY} is not defined. Please set this in env.sh and try again."
+	exit 2
+fi
+if [ ! -v ORIGINALKEY ]; then
+	echo "${ORIGINALKEY} is not defined. Please set this in env.sh and try again."
+	exit 3
+fi
+if [ ! -v VMROOTDISK ]; then
+	echo "${VMROOTDISK} is not defined. Please set this in env.sh and try again."
+	exit 4
+fi
+if [ ! -v INITIALPASSWD ]; then
+	echo "${INITIALPASSWD} is not defined. Please set this in env.sh and try again."
+	exit 5
 fi
 
-for i in `cat hosts|grep -v \\\\[`;
-do 
+HOSTSFILE=hosts
+if [ ! -r "$HOSTSFILE" ]; then
+	echo "${HOSTSFILE} is missing."
+	exit 10
+fi
 
-    echo "########################################################################"
-    echo "[$i start]"
+# create the VM directory if it doesn't exist
+if [ ! -d "$VMS" ]; then
+    echo "Creating ${VMS}"
+    mkdir -p "$VMS"
+fi
 
-    baseimage="$VMS/$i-base.qcow2"
-    image="$VMS/$i.qcow2"
-    dockerdisk="$VMS/$i-docker.qcow2"
-    glusterfsdisk="$VMS/$i-glusterfs.qcow2"
+# sanity checks around the ssh key stuff
+if [ ! -f "$CLUSTERKEY" ]; then # if the cluster sshkey doesn't exist, try to copy it from the original key
+	if [ ! -r "$ORIGINALKEY" ]; then # check to see if the original key exists and is readable
+		echo "${CLUSTERKEY} does not exist, and ${ORIGINALKEY} can't be found/read."
+		exit 6
+	fi
 
-    echo "[Creating a $VMROOTDISK disk for root, $image]"
-    qemu-img create -f qcow2 $baseimage $VMROOTDISK
-    virt-resize --expand /dev/sda1 $RHEL_IMAGE $baseimage
+	# if CLUSTERKEY doesn't exist, but the ORIGINALKEY does, copy it. 
+	cp "$ORIGINALKEY" "$CLUSTERKEY"
+	COPYRESULT=$?
+	if [ "$COPYRESULT" -ne 0 ]; then
+		echo "Error: Copying ${ORIGINALKEY} to create ${CLUSTERKEY} failed with: ${COPYRESULT}"
+		exit 7
+	fi
+fi
+if [ ! -r "$CLUSTERKEY" ]; then # bomb out if the cluster sshkey isn't readable
+	echo "${CLUSTERKEY} is missing, or is not readbale. Exiting now."
+	exit 8
+fi
 
-    qemu-img create -f qcow2 -b $baseimage $image
+# ensure that the permissions are correct for the new cluster key
+chmod 644 "$CLUSTERKEY"
 
-    echo "[Creating a $VMDOCKERDISK disk for docker, $dockerdisk]"
-    qemu-img create -f raw $dockerdisk $VMDOCKERDISK
+# a safer, cleaner loop over the hosts file to read in lines, rather than words
+grep -E '^[^\[ ]' < $HOSTSFILE | while IFS= read -r i
+do 
+    echo "########################################################################"
+    echo "[${i} start]"
 
-    echo "[Creating a $VMGLUSTERFSDISK disk for glusterfs, $glusterfsdisk]"
-    qemu-img create -f raw $glusterfsdisk $VMGLUSTERFSDISK
+    BASEIMAGE="${VMS}/${i}-base.qcow2"
+    IMAGE="${VMS}/${i}.qcow2"
+    DOCKERDISK="${VMS}/${i}-docker.qcow2"
+    GLUSTERFSDISK="${VMS}/${i}-glusterfs.qcow2"
 
-    echo "[Customizing $i system]"
-    virt-customize -a $image --run-command 'yum remove cloud-init* -y'
-    virt-customize -a $image --root-password password:redhat
-    virt-customize -a $image --ssh-inject root:file:$WORKSPACE/vm_id_rsa.pub
-    virt-customize -a $image --hostname "$i"
-    echo "[$i done]"
+    echo "[Creating a ${VMROOTDISK} disk for root, ${IMAGE}]"
+    qemu-img create -f qcow2 "$BASEIMAGE" "$VMROOTDISK"
+    virt-resize --expand /dev/sda1 "$RHEL_IMAGE" "$BASEIMAGE"
+    qemu-img create -f qcow2 -b "$BASEIMAGE" "$IMAGE"
 
-done
+    echo "[Creating a ${VMDOCKERDISK} disk for docker, ${DOCKERDISK}]"
+    qemu-img create -f raw "$DOCKERDISK" "$VMDOCKERDISK"
+
+    echo "[Creating a ${VMGLUSTERFSDISK} disk for glusterfs, ${GLUSTERFSDISK}]"
+    qemu-img create -f raw "$GLUSTERFSDISK" "$VMGLUSTERFSDISK"
 
-exit
+    echo "[Customizing ${i} system]"
+    virt-customize -a "$IMAGE" --run-command 'yum remove cloud-init* -y'
+    virt-customize -a "$IMAGE" --root-password password:"$INITIALPASSWD"
+    virt-customize -a "$IMAGE" --ssh-inject root:file:"$CLUSTERKEY"
+    virt-customize -a "$IMAGE" --hostname "$i"
+    echo "[${i} done]"
+done

2-build-jump.sh

@@ -20,10 +20,10 @@ do
     echo "[dry-run install $i w/ mac ${MACADDRESS[$i]}"
 
     virt-install --ram $VMRAM_JUMP  --vcpus 4 --os-variant rhel7 --disk path=$image,device=disk,bus=virtio,format=qcow2 \
-        --noautoconsole --vnc --name $i --dry-run --cpu Skylake-Client,+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
+        --noautoconsole --vnc --name $i --dry-run --cpu ${CPUMODEL},+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
     	--print-xml > $VMS/$i.xml
 # You may also need to change the CPU depending on the hypervisor's CPU
-#    	--noautoconsole --vnc --name $i --dry-run --cpu Skylake-Client,+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
+#    	--noautoconsole --vnc --name $i --dry-run --cpu ${CPUMODEL},+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
 
     echo "[define $i]"
     virsh define --file $VMS/$i.xml

2-build-node.sh

@@ -20,10 +20,10 @@ do
     echo "[dry-run install $i w/ mac ${MACADDRESS[$i]}"
 
     virt-install --ram $VMRAM_OCP  --vcpus 4 --os-variant rhel7 --disk path=$image,device=disk,bus=virtio,format=qcow2 \
-        --noautoconsole --vnc --name $i --dry-run --cpu Skylake-Client,+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
+        --noautoconsole --vnc --name $i --dry-run --cpu ${CPUMODEL},+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
     	--print-xml > $VMS/$i.xml
 # You may also need to change the CPU depending on the hypervisor's CPU
-#    	--noautoconsole --vnc --name $i --dry-run --cpu Skylake-Client,+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
+#    	--noautoconsole --vnc --name $i --dry-run --cpu ${CPUMODEL},+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
 
     echo "[define $i]"
     virsh define --file $VMS/$i.xml

2-build.sh

@@ -20,10 +20,10 @@ do
     echo "[dry-run install $i w/ mac ${MACADDRESS[$i]}"
 
     virt-install --ram $VMRAM_OCP  --vcpus 4 --os-variant rhel7 --disk path=$image,device=disk,bus=virtio,format=qcow2 \
-        --noautoconsole --vnc --name $i --dry-run --cpu Skylake-Client,+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
+        --noautoconsole --vnc --name $i --dry-run --cpu ${CPUMODEL},+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
     	--print-xml > $VMS/$i.xml
 # You may also need to change the CPU depending on the hypervisor's CPU
-#    	--noautoconsole --vnc --name $i --dry-run --cpu Skylake-Client,+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
+#    	--noautoconsole --vnc --name $i --dry-run --cpu ${CPUMODEL},+vmx --network bridge=${BRIDGE},mac=${MACADDRESS[$i]} \
 
     echo "[define $i]"
     virsh define --file $VMS/$i.xml