Updates autounattend floppy images and scripts

alexpilotti · alexpilotti · commit e610e73f57c4 · 2013-10-13T22:17:08.000+03:00
diff --git a/Autounattend.xml b/Autounattend.xml
@@ -55,7 +55,7 @@
                                 Hyper-V Server 2012 R2 SERVERHYPERCORE
                                 Windows Server 2012 R2 SERVERSTANDARD
                             -->
-                            <Value>Hyper-V Server 2012 R2 SERVERHYPERCORE</Value>
+                            <Value>%IMAGENAME%</Value>
                         </MetaData>
                     </InstallFrom>
                 </OSImage>
diff --git a/configure-rdo.sh b/configure-rdo.sh
@@ -39,6 +39,7 @@ wait_for_listening_port () {
     PORT=$2
     TIMEOUT=$3
     nc -z -w$TIMEOUT $HOST $PORT
+    echo $?
 }
 
 configure_ssh_pubkey_auth () {
diff --git a/create-floppy-hyperv-2012-cloudbaseinit.sh b/create-floppy-hyperv-2012-cloudbaseinit.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+BASEDIR=$(dirname $0)
+
+TMP_AUTOUNATTEND_FILE=/tmp/Autounattend.xml
+
+cp $BASEDIR/Autounattend.xml $TMP_AUTOUNATTEND_FILE
+sed -i 's/%IMAGENAME%/Hyper-V Server 2012 SERVERHYPERCORE/g' $TMP_AUTOUNATTEND_FILE
+
+$BASEDIR/create-floppy.sh $BASEDIR/unattend_hyperv_2012_cloudbaseinit.flp $TMP_AUTOUNATTEND_FILE
+rm $TMP_AUTOUNATTEND_FILE
+
diff --git a/create-floppy-hyperv-2012-r2-cloudbaseinit.sh b/create-floppy-hyperv-2012-r2-cloudbaseinit.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+BASEDIR=$(dirname $0)
+
+TMP_AUTOUNATTEND_FILE=/tmp/Autounattend.xml
+
+cp $BASEDIR/Autounattend.xml $TMP_AUTOUNATTEND_FILE
+sed -i 's/%IMAGENAME%/Hyper-V Server 2012 R2 SERVERHYPERCORE/g' $TMP_AUTOUNATTEND_FILE
+
+$BASEDIR/create-floppy.sh $BASEDIR/unattend_hyperv_2012_r2_cloudbaseinit.flp $TMP_AUTOUNATTEND_FILE
+rm $TMP_AUTOUNATTEND_FILE
+
diff --git a/create-hyperv-2012-vm-template.sh b/create-hyperv-2012-vm-template.sh
@@ -2,7 +2,7 @@
 
 BASEDIR=$(dirname $0)
 DATASTORE=datastore1
-FLOPPY_IMAGE_PATH=$BASEDIR/unattend_hyperv_2012.flp
+FLOPPY_IMAGE_PATH=$BASEDIR/unattend_hyperv_2012_cloudbaseinit.flp
 
 $BASEDIR/create-vm-template.sh $DATASTORE winhyperv hyperv-2012-template-80G 2048 80G /vmfs/volumes/datastore2/iso/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso windows $FLOPPY_IMAGE_PATH "VM Network" true true 
 
diff --git a/deploy-rdo-example.sh b/deploy-rdo-example.sh
@@ -2,7 +2,7 @@
 set -e
 
 RDO_NAME=rdo_test_$RANDOM
-ESXI_HOST=10.7.2.2
+ESXI_HOST=10.7.2.5
 ESXI_USER=root
 
 DATASTORE=datastore1
diff --git a/unattend_hyperv_2012_cloudbaseinit.flp b/unattend_hyperv_2012_cloudbaseinit.flp
diff --git a/unattend_hyperv_2012_r2_cloudbaseinit.flp b/unattend_hyperv_2012_r2_cloudbaseinit.flp

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ wait_for_listening_port () {`
`39`	`39`	`PORT=$2`
`40`	`40`	`TIMEOUT=$3`
`41`	`41`	`nc -z -w$TIMEOUT $HOST $PORT`
	`42`	`+ echo $?`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`configure_ssh_pubkey_auth () {`