Merge lp:~rodsmith/maas-cert-server/split-admin-login into lp:~hardware-certification/maas-cert-server/trunk

[Rod Smith]

Split MAAS login code into a tiny function and call it two places in the script, to ensure it's run when --update-point-releases is called.

[Jeff Lane  (bladernr)]

Cool. Thanks for fixing that bug you pointed out.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-06 23:31:49 +0000
+++ debian/changelog	2015-08-07 17:01:22 +0000
@@ -1,3 +1,10 @@
+maas-cert-server (0.2.6-0ppa1) trusty; urgency=medium
+
+  * Fixed bug 1482698, which prevented maniacs-setup
+    --update-point-releases from working under some circumstances.
+
+ -- Rod Smith <[e-mail]>  Fri, 07 Aug 2015 12:55:43 -0400
+
 maas-cert-server (0.2.5-0ppa1) trusty; urgency=medium
 
   * Updated maniacs-setup to pull down 14.04.3 point-release images

=== modified file 'usr/sbin/maniacs-setup'
--- usr/sbin/maniacs-setup	2015-08-06 23:31:49 +0000
+++ usr/sbin/maniacs-setup	2015-08-07 17:01:22 +0000
@@ -200,6 +200,12 @@
 }
 
 
+login_maas_admin() {
+    local APIKEY=$(maas-region-admin apikey --username $DEFAULT_USER | tail -n1)
+    maas login admin $MAAS_URL $APIKEY
+}
+
+
 setup_maas_admin() {
     # Configure the MAAS admin user
     # Sadly, there's no way to test if the user has been created already,
@@ -225,8 +231,7 @@
     done
     echo "* Setting up the $DEFAULT_USER MAAS account using the supplied password"
     maas-region-admin createadmin --username $DEFAULT_USER --email [e-mail] --password="$password1" 2>/dev/null || true
-    APIKEY=$(maas-region-admin apikey --username $DEFAULT_USER | tail -n1)
-    maas login admin $MAAS_URL $APIKEY
+    login_maas_admin
 }
 
 
@@ -595,6 +600,7 @@
     echo "* imported."
     echo "*"
     get_yn "* Do you want to import the 12.04 point-release images, too" "N"
+    login_maas_admin
     if [ "$YN" = "Y" ] ; then
         local versions=(14.04.3 14.04.2 14.04.1 14.04 12.04 12.04.1 12.04.2 12.04.3 12.04.4 12.04.5)
     else