Merge lp:~hopem/maas-deployer/lp1577910 into lp:~maas-deployers/maas-deployer/next

[Edward Hope-Morley]

[Billy Olsen (billy-olsen)]

LGTM, Approved.

review: Approve

=== modified file 'maas_deployer/vmaas/maasclient/bootimages.py'
--- maas_deployer/vmaas/maasclient/bootimages.py	2015-12-10 05:47:47 +0000
+++ maas_deployer/vmaas/maasclient/bootimages.py	2016-05-10 15:54:54 +0000
@@ -37,16 +37,18 @@
         url = 'http://%(host)s/MAAS' % {'host': self.host}
         response, _ = self.http.request(url, 'GET')
         self.headers['Content-type'] = 'application/x-www-form-urlencoded'
-        self.headers['Cookie'] = response['set-cookie']
 
-        csrf_token = self.headers['Cookie'].split(';')[0].split('=')[1]
         body = {
             'username': self.username,
             'password': self.password,
             'next': '/MAAS/images',
-            'csrfmiddlewaretoken': csrf_token
         }
 
+        if 'set-cookie' in response:
+            self.headers['Cookie'] = response['set-cookie']
+            csrf_token = self.headers['Cookie'].split(';')[0].split('=')[1]
+            body['csrfmiddlewaretoken'] = csrf_token
+
         url = 'http://%(host)s/MAAS/accounts/login/' % {'host': self.host}
         response, _ = self.http.request(url, 'POST', headers=self.headers,
                                         body=urllib.urlencode(body))