From 86863ee1f083dbdadcb896734b319aa59a2707c4 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Fri, 3 Nov 2017 17:41:26 +0100 Subject: Some more deploy scripting and hard-coded tests --- nfs/scripts/image_deploy.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'nfs/scripts/image_deploy.sh') diff --git a/nfs/scripts/image_deploy.sh b/nfs/scripts/image_deploy.sh index e23fd70..69c5cf6 100644 --- a/nfs/scripts/image_deploy.sh +++ b/nfs/scripts/image_deploy.sh @@ -8,11 +8,14 @@ monthday=$(date +%m-%d) # define what master image should be used for the current client machine #TODO : have a better place for that (CMDB...) case "$hostname" in - I5480) mastername=pctp-master ;; - *) mastername=I4920 ;; -# *) echo_color white red ">>> " "No master for $hostname (see image_deploy.sh)" ; exit 1 ;; + I5480) mastername=I5456 ;; + I5454) mastername=I5456 ;; + *) echo_color white red ">>> " "No master for $hostname (see image_deploy.sh)" ; exit 1 ;; esac +# Check and print if the deploy script is defined for the current master machine +scriptavailability_test image_deploy_${mastername}.sh || exit $? + # Determine which image take #TODO : have a better place for that (CMDB...) ls -ld "$imagedir/$year/$mastername/" @@ -21,8 +24,7 @@ indir=$(find "$imagedir/$year/$mastername/" -maxdepth 1 -type d -regex '.*/\d\d- # Put a bad value to help the user to see where the image should be available indir=${indir:-$imagedir/$year/$mastername/XX-XX} -# Check and print if the deploy script is defined for the current master machine -scriptavailability_test image_deploy_${mastername}.sh || exit $? +# Check and print if the select image is available diravailability_test $indir || exit $? # Print all variables and start the deploy using the customized script (image_deploy_.sh) @@ -30,6 +32,7 @@ setterm -bold on env setterm -bold off echo_color green black "$scriptdir/image_deploy_${mastername}.sh script will run on tty1 now" +pause10s source $scriptdir/image_deploy_${mastername}.sh -- cgit v1.2.3