Merge ~dannf/canonical-server-hwe-utils:update-conserver-fixes into canonical-server-hwe-utils:master

[dann frazier]

[Taihsiang Ho (tai271828)]

review: Approve

diff --git a/sysadmin-tools/update_conserver.sh b/sysadmin-tools/update_conserver.sh
index 7d28eca..d38088a 100755
--- a/sysadmin-tools/update_conserver.sh
+++ b/sysadmin-tools/update_conserver.sh
@@ -20,13 +20,16 @@ if [ -z "$lab" ]; then
     exit 1
 fi
 
+if [ ! -e ./gen_conserver_cf.py ]; then
+    echo "ERROR: Did not find gen_conserver_cf.py in the current directory."
+    exit 1
+fi
+
 case "$lab" in
     1ss)
-	labname="1ss-production"
 	server="10.229.0.101"
 	;;
     tremont)
-	labname="tremont-production"
 	server="10.228.0.2"
 	;;
     *)
@@ -42,10 +45,10 @@ cleanup() {
 }
 trap cleanup EXIT
 
-git clone git+ssh://git.launchpad.net/scalebot ${tmpdir}/scalebot
-labdir=${tmpdir}/scalebot/labs/$labname
+git clone --depth 1 git+ssh://git.launchpad.net/scalebot ${tmpdir}/scalebot
+labdir=${tmpdir}/scalebot/labs/$lab
 if [ ! -d $labdir ]; then
-    "ERROR: Lab $labname directory not found"
+    "ERROR: Lab $lab directory not found"
     exit 1
 fi
 
@@ -64,5 +67,7 @@ ssh -t ${server} sudo chown --reference=/etc/conserver/conserver.cf ${remote_tmp
 ssh -t ${server} sudo chmod --reference=/etc/conserver/conserver.cf ${remote_tmp}
 ssh -t ${server} sudo cp ${remote_tmp} /etc/conserver/conserver.cf
 
-echo "Reloading conserver-server on ${server}..."
-ssh -t ${server} sudo service conserver-server reload
+echo "Stopping conserver-server on ${server}..."
+ssh -t ${server} sudo service conserver-server stop
+echo "Starting conserver-server on ${server}..."
+ssh -t ${server} sudo service conserver-server start