Refactoring to support custom datastore names

Author: alexpilotti

create-all-templates.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+set -e
+
+if [ $# -ne 3 ]; then
+    echo "Usage: $0 <esxi_user> <esxi_host> <scripts_datastore>"
+    exit 1
+fi
+
+ESXI_USER=$1
+ESXI_HOST=$2
+SCRIPTS_DATASTORE=$3
+
+ESXI_SCRIPTS_DIR=/vmfs/volumes/$SCRIPTS_DATASTORE/unattended-scripts/templates
+
+TEMPLATE_SCRIPTS[0]="create-hyperv-2012-r2-vm-template.sh"
+TEMPLATE_SCRIPTS[1]="create-hyperv-2012-vm-template.sh"
+TEMPLATE_SCRIPTS[2]="create-hyperv-2012-cn-vm-template.sh"
+TEMPLATE_SCRIPTS[3]="create-windows-8.1-enterprise-vm-template.sh"
+TEMPLATE_SCRIPTS[4]="create-centos-64-vm-template.sh"
+TEMPLATE_SCRIPTS[5]="create-centos-64-cloudinit-vm-template.sh"
+TEMPLATE_SCRIPTS[6]="create-ubuntu-1204-server-vm-template.sh"
+
+
+for TEMPLATE_SCRIPT in "${TEMPLATE_SCRIPTS[@]}"; do
+    ssh $ESXI_USER@$ESXI_HOST "$ESXI_SCRIPTS_DIR/$TEMPLATE_SCRIPT" > /dev/null &
+done
+
+wait
+

create-centos-64-cloudinit-vm-template.sh

@@ -1,23 +1,25 @@
 #!/bin/bash
 set -e
 
-if [ $# -lt 2 ]; then
-    echo "Usage: $0 <esxi_user> <esxi_host> [<use_linked_vmdks>]"
+if [ $# -lt 5 ]; then
+    echo "Usage: $0 <esxi_user> <esxi_host> <scripts_datastore> <templates_datastore> <datastore> [<use_linked_vmdks>]"
     exit 1
 fi
 
 ESXI_USER=$1
 ESXI_HOST=$2
-VMDK_OPTION=$3
+SCRIPTS_DATASTORE=$3
+TEMPLATES_DATASTORE=$4
+DATASTORE=$5
+VMDK_OPTION=$6
 
 DEVSTACK_NAME=devstack-test-$RANDOM
 
-DATASTORE=ssd1
 ESXI_PUBLIC_SWITCH=vSwitch0
 ESXI_PUBLIC_VMNIC=vmnic0
 
-LINUX_TEMPLATE_VMDK=/vmfs/volumes/datastore1/ubuntu-12.04-server-template-40G/ubuntu-12.04-server-template-40G.vmdk
-HYPERV_TEMPLATE_VMDK=/vmfs/volumes/datastore1/hyperv-2012-r2-template-80G/hyperv-2012-r2-template-80G.vmdk
+LINUX_TEMPLATE_VMDK=/vmfs/volumes/$TEMPLATES_DATASTORE/ubuntu-12.04-server-template-100G/ubuntu-12.04-server-template-40G.vmdk
+HYPERV_TEMPLATE_VMDK=/vmfs/volumes/$TEMPLATES_DATASTORE/hyperv-2012-r2-template-100G/hyperv-2012-r2-template-80G.vmdk
 
 if [ "$VMDK_OPTION" == "use_linked_vmdks" ]; then
     LINUX_TEMPLATE_VMDK=${LINUX_TEMPLATE_VMDK%%.vmdk}-000001.vmdk
@@ -28,5 +30,5 @@ BASEDIR=$(dirname $0)
 
 echo "Deploying DevStack: $DEVSTACK_NAME"
 
-$BASEDIR/deploy-devstack.sh $ESXI_USER $ESXI_HOST "$DATASTORE" "$DEVSTACK_NAME" "$ESXI_PUBLIC_SWITCH" $ESXI_PUBLIC_VMNIC "$LINUX_TEMPLATE_VMDK" "$HYPERV_TEMPLATE_VMDK"
+$BASEDIR/deploy-devstack.sh $ESXI_USER $ESXI_HOST "$SCRIPTS_DATASTORE" "$DATASTORE" "$DEVSTACK_NAME" "$ESXI_PUBLIC_SWITCH" $ESXI_PUBLIC_VMNIC "$LINUX_TEMPLATE_VMDK" "$HYPERV_TEMPLATE_VMDK"
 

create-centos-64-vm-template.sh

@@ -1,21 +1,22 @@
 #!/bin/bash
 set -e
 
-if [ $# -ne 8 ]; then
-    echo "Usage: $0 <esxi_user> <esxi_host> <datastore> <name> <esxi_public_switch> <esxi_public_vnic> <linux_template_vmdk> <hyperv_template_vmdk>"
+if [ $# -ne 9 ]; then
+    echo "Usage: $0 <esxi_user> <esxi_host> <scripts_datastore> <datastore> <name> <esxi_public_switch> <esxi_public_vnic> <linux_template_vmdk> <hyperv_template_vmdk>"
     exit 1
 fi
 
 ESXI_USER=$1
 ESXI_HOST=$2
-DATASTORE=$3
-DEVSTACK_NAME=$4
-ESXI_PUBLIC_SWITCH=$5
-ESXI_PUBLIC_VNIC=$6
-LINUX_TEMPLATE_VMDK=$7
-HYPERV_TEMPLATE_VMDK=$8
-
-ESXI_BASEDIR=/vmfs/volumes/datastore1/unattended-scripts
+SCRIPTS_DATASTORE=$3
+DATASTORE=$4
+DEVSTACK_NAME=$5
+ESXI_PUBLIC_SWITCH=$6
+ESXI_PUBLIC_VNIC=$7
+LINUX_TEMPLATE_VMDK=$8
+HYPERV_TEMPLATE_VMDK=$9
+
+ESXI_BASEDIR=/vmfs/volumes/$SCRIPTS_DATASTORE/unattended-scripts
 VM_IPS_FILE=`mktemp -u /tmp/devstack_ips.XXXXXX`
 
 BASEDIR=$(dirname $0)

create-hyperv-2012-cn-vm-template.sh

@@ -1,28 +1,30 @@
 #!/bin/bash
 set -e
 
-if [ $# -lt 3 ]; then
-    echo "Usage: $0 <esxi_user> <esxi_host> <openstack_release> [<use_linked_vmdks>]"
+if [ $# -lt 6 ]; then
+    echo "Usage: $0 <esxi_user> <esxi_host> <scripts_datastore> <templates_datastore> <datastore> <openstack_release> [<use_linked_vmdks>]"
     exit 1
 fi
 
 ESXI_USER=$1
 ESXI_HOST=$2
-OPENSTACK_RELEASE=$3
-VMDK_OPTION=$4
+SCRIPTS_DATASTORE=$3
+TEMPLATES_DATASTORE=$4
+DATASTORE=$5
+OPENSTACK_RELEASE=$6
+VMDK_OPTION=$7
 
 RDO_NAME=rdo-test-$RANDOM
 
-DATASTORE=ssd1
 ESXI_PUBLIC_SWITCH=vSwitch0
 ESXI_PUBLIC_VMNIC=vmnic0
 
-LINUX_TEMPLATE_VMDK=/vmfs/volumes/datastore1/centos-6.4-template-40G/centos-6.4-template-40G.vmdk
+LINUX_TEMPLATE_VMDK=/vmfs/volumes/$TEMPLATES_DATASTORE/centos-6.4-template-100G/centos-6.4-template-40G.vmdk
 
 if [ "$OPENSTACK_RELEASE" == "grizzly" ]; then
-    HYPERV_TEMPLATE_VMDK=/vmfs/volumes/datastore1/hyperv-2012-template-80G/hyperv-2012-template-80G.vmdk
+    HYPERV_TEMPLATE_VMDK=/vmfs/volumes/$TEMPLATES_DATASTORE/hyperv-2012-template-100G/hyperv-2012-template-80G.vmdk
 else
-    HYPERV_TEMPLATE_VMDK=/vmfs/volumes/datastore1/hyperv-2012-r2-template-80G/hyperv-2012-r2-template-80G.vmdk
+    HYPERV_TEMPLATE_VMDK=/vmfs/volumes/$TEMPLATES_DATASTORE/hyperv-2012-r2-template-100G/hyperv-2012-r2-template-80G.vmdk
 fi
 
 if [ "$VMDK_OPTION" == "use_linked_vmdks" ]; then
@@ -34,5 +36,5 @@ BASEDIR=$(dirname $0)
 
 echo "Deploying RDO: $RDO_NAME"
 
-$BASEDIR/deploy-rdo.sh $ESXI_USER $ESXI_HOST "$DATASTORE" $OPENSTACK_RELEASE "$RDO_NAME" "$ESXI_PUBLIC_SWITCH" $ESXI_PUBLIC_VMNIC "$LINUX_TEMPLATE_VMDK" "$HYPERV_TEMPLATE_VMDK"
+$BASEDIR/deploy-rdo.sh $ESXI_USER $ESXI_HOST "$SCRIPTS_DATASTORE" "$DATASTORE" $OPENSTACK_RELEASE "$RDO_NAME" "$ESXI_PUBLIC_SWITCH" $ESXI_PUBLIC_VMNIC "$LINUX_TEMPLATE_VMDK" "$HYPERV_TEMPLATE_VMDK"
 

create-hyperv-2012-r2-vm-template.sh

@@ -1,20 +1,21 @@
 #!/bin/bash
 set -e
 
-if [ $# -ne 9 ]; then
-    echo "Usage: $0 <esxi_user> <esxi_host> <datastore> <openstack_release> <rdo_name> <esxi_public_switch> <esxi_public_vnic> <linux_template_vmdk> <hyperv_template_vmdk>"
+if [ $# -ne 10 ]; then
+    echo "Usage: $0 <esxi_user> <esxi_host> <scripts_datastore> <datastore> <openstack_release> <rdo_name> <esxi_public_switch> <esxi_public_vnic> <linux_template_vmdk> <hyperv_template_vmdk>"
     exit 1
 fi
 
 ESXI_USER=$1
 ESXI_HOST=$2
-DATASTORE=$3
-OPENSTACK_RELEASE=$4
-RDO_NAME=$5
-ESXI_PUBLIC_SWITCH=$6
-ESXI_PUBLIC_VNIC=$7
-LINUX_TEMPLATE_VMDK=$8
-HYPERV_TEMPLATE_VMDK=$9
+SCRIPTS_DATASTORE=$3
+DATASTORE=$4
+OPENSTACK_RELEASE=$5
+RDO_NAME=$6
+ESXI_PUBLIC_SWITCH=$7
+ESXI_PUBLIC_VNIC=$8
+LINUX_TEMPLATE_VMDK=$9
+HYPERV_TEMPLATE_VMDK=${10}
 
 BASEDIR=$(dirname $0)
 
@@ -29,7 +30,7 @@ grizzly|havana)
     ;;
 esac
 
-ESXI_BASEDIR=/vmfs/volumes/datastore1/unattended-scripts
+ESXI_BASEDIR=/vmfs/volumes/$SCRIPTS_DATASTORE/unattended-scripts
 RDO_VM_IPS_FILE=`mktemp -u /tmp/rdo_ips.XXXXXX`
 
 ssh $ESXI_USER@$ESXI_HOST $ESXI_BASEDIR/deploy-rdo-esxi-vms.sh $DATASTORE $RDO_NAME $ESXI_PUBLIC_SWITCH $ESXI_PUBLIC_VNIC "$LINUX_TEMPLATE_VMDK" "$HYPERV_TEMPLATE_VMDK" $RDO_VM_IPS_FILE

create-hyperv-2012-vm-template.sh

@@ -2,24 +2,25 @@
 set -e
 
 if [ $# -lt 3 ]; then
-    echo "Usage: $0 <esxi_user> <esxi_host> <template> [<resource_pool_name>] [<datastore>] [<vm_name>] [<ram>] [<network>]"
+    echo "Usage: $0 <esxi_user> <esxi_host> <template> [<scripts_datastore>] [<resource_pool_name>] [<datastore>] [<vm_name>] [<ram>] [<network>]"
     exit 1
 fi
 
 ESXI_USER=$1
 ESXI_HOST=$2
 TEMPLATE_NAME=$3
-POOL_NAME=${4:-$ESXI_USER}
-DATASTORE=${5:-datastore1}
-VM_NAME=${6:-$TEMPLATE_NAME-$RANDOM}
-RAM=${7:-1024}
-NETWORK=${8:-"VM Network"}
+SCRIPTS_DATASTORE=${4:-ssd1}
+POOL_NAME=${5:-$ESXI_USER}
+DATASTORE=${6:-ssd1}
+VM_NAME=${7:-$TEMPLATE_NAME-$RANDOM}
+RAM=${8:-1024}
+NETWORK=${9:-"VM Network"}
 
 TEMPLATE_DATASTORE=ssd1
 
 NET_ADAPTER_TYPE=vmxnet3
 
-ESXI_BASEDIR=/vmfs/volumes/datastore1/unattended-scripts
+ESXI_BASEDIR=/vmfs/volumes/ssd1/unattended-scripts
 TEMPLATE_BASEDIR=/vmfs/volumes/$TEMPLATE_DATASTORE/$TEMPLATE_NAME
 
 TEMPLATE_VMX_FILE=$TEMPLATE_BASEDIR/$TEMPLATE_NAME.vmx

create-ubuntu-1204-server-vm-template.sh

@@ -1,18 +1,19 @@
 #!/bin/bash
 set -e
 
-if [ $# -ne 2 ]; then
-    echo "Usage: $0 <esxi_user> <esxi_host>"
+if [ $# -ne 3 ]; then
+    echo "Usage: $0 <esxi_user> <esxi_host> <datastore>"
     exit 1
 fi
 
 ESXI_USER=$1
 ESXI_HOST=$2
+DATASTORE=$3
 
-ESXI_BASEDIR=/vmfs/volumes/datastore1/unattended-scripts
+ESXI_BASEDIR=/vmfs/volumes/$DATASTORE/unattended-scripts
 
 BASEDIR=$(dirname $0)
 
-ssh $ESXI_USER@$ESXI_HOST "mkdir -p $ESXI_BASEDIR"
-scp $BASEDIR/* $ESXI_USER@$ESXI_HOST:$ESXI_BASEDIR/
+ssh $ESXI_USER@$ESXI_HOST "if [ -d $ESXI_BASEDIR ]; then rm -rf $ESXI_BASEDIR; fi && mkdir -p $ESXI_BASEDIR"
+scp -r $BASEDIR/esxi/* $ESXI_USER@$ESXI_HOST:$ESXI_BASEDIR/
 

create-windows-8.1-enterprise-vm-template.sh

@@ -0,0 +1,4 @@
+TEMPLATES_DATASTORE=ssd1
+ISO_DATASTORE=datastore2
+ISO_DIR=iso
+

deploy-devstack-example.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+BASEDIR=$(dirname $0)
+source $BASEDIR/config
+FLOPPY_IMAGE_PATH=$BASEDIR/ks_cloudinit.flp
+ISO_PATH=/vmfs/volumes/$ISO_DATASTORE/$ISO_DIR/CentOS-6.4-x86_64-bin-DVD1-ks.iso
+SIZE=10G
+
+$BASEDIR/create-vm-template.sh $TEMPLATES_DATASTORE rhel6-64 centos-6.4-cloudinit-template-$SIZE 1024 $SIZE "$ISO_PATH" linux "$FLOPPY_IMAGE_PATH" "VM Network" true true 
+

deploy-devstack.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+BASEDIR=$(dirname $0)
+source $BASEDIR/config
+FLOPPY_IMAGE_PATH=$BASEDIR/ks.flp
+ISO_PATH=/vmfs/volumes/$ISO_DATASTORE/$ISO_DIR/CentOS-6.4-x86_64-bin-DVD1-ks.iso
+SIZE=100G
+
+$BASEDIR/create-vm-template.sh $TEMPLATES_DATASTORE rhel6-64 centos-6.4-template-$SIZE 1024 $SIZE "$ISO_PATH" linux "$FLOPPY_IMAGE_PATH" "VM Network" true true 
+

deploy-rdo-example.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+BASEDIR=$(dirname $0)
+source $BASEDIR/config
+FLOPPY_IMAGE_PATH=$BASEDIR/unattend_hyperv_2012_cloudbaseinit.flp
+ISO_PATH=/vmfs/volumes/$ISO_DATASTORE/$ISO_DIR/cn_microsoft_hyper-v_server_2012_x64_dvd_915786.iso
+SIZE=100G
+
+$BASEDIR/create-vm-template.sh $TEMPLATES_DATASTORE winhyperv hyperv-2012-cn-template-$SIZE 2048 $SIZE "$ISO_PATH" windows "$FLOPPY_IMAGE_PATH" "VM Network" true true
+ 

deploy-rdo.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+BASEDIR=$(dirname $0)
+source $BASEDIR/config
+FLOPPY_IMAGE_PATH=$BASEDIR/unattend_hyperv_2012_r2_cloudbaseinit.flp
+ISO_PATH=/vmfs/volumes/$ISO_DATASTORE/$ISO_DIR/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso
+SIZE=100G
+
+$BASEDIR/create-vm-template.sh $TEMPLATES_DATASTORE winhyperv hyperv-2012-r2-template-$SIZE 2048 $SIZE "$ISO_PATH" windows "$FLOPPY_IMAGE_PATH" "VM Network" true true
+

deploy-template.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+BASEDIR=$(dirname $0)
+source $BASEDIR/config
+FLOPPY_IMAGE_PATH=$BASEDIR/unattend_hyperv_2012_cloudbaseinit.flp
+ISO_PATH=/vmfs/volumes/$ISO_DATASTORE/$ISO_DIR/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso
+SIZE=100G
+
+$BASEDIR/create-vm-template.sh $TEMPLATES_DATASTORE winhyperv hyperv-2012-template-$SIZE 2048 $SIZE "$ISO_PATH" windows "$FLOPPY_IMAGE_PATH" "VM Network" true true
+

esxi_add_ssh_authorized_key.sh esxi-add-ssh-authorized-key.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+BASEDIR=$(dirname $0)
+source $BASEDIR/config
+FLOPPY_IMAGE_PATH=$BASEDIR/preseed.flp
+ISO_PATH=/vmfs/volumes/$ISO_DATASTORE/$ISO_DIR/ubuntu-12.04.3-server-amd64-preseed.iso
+SIZE=100G
+
+$BASEDIR/create-vm-template.sh $TEMPLATES_DATASTORE ubuntu-64 ubuntu-12.04-server-template-$SIZE 1024 $SIZE "$ISO_PATH" linux "$FLOPPY_IMAGE_PATH" "VM Network" true true 
+