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

[Edward Hope-Morley]

[Billy Olsen (billy-olsen)]

Changes look fine. We should also set the manage_etc_hosts: True in the cloud-init config so that the sudo doesn't always complain about not being able to resolve hostnames. I'll take care of that in the merge.

review: Approve

=== modified file 'maas_deployer/vmaas/templates/cloud-init.cfg'
--- maas_deployer/vmaas/templates/cloud-init.cfg	2015-08-28 03:40:34 +0000
+++ maas_deployer/vmaas/templates/cloud-init.cfg	2015-09-10 12:35:33 +0000
@@ -9,7 +9,9 @@
   - {{ ssh_key }}
 {% endif %} 
 
-hostname: localhost
+{% if hostname -%}
+hostname: {{ hostname }}
+{%- endif %}
 
 {% if apt_http_proxy -%}
 apt_proxy: {{ apt_http_proxy }}

=== modified file 'maas_deployer/vmaas/vm.py'
--- maas_deployer/vmaas/vm.py	2015-08-14 16:59:12 +0000
+++ maas_deployer/vmaas/vm.py	2015-09-10 12:35:33 +0000
@@ -426,6 +426,7 @@
         """
         base_file = os.path.join(working_dir, 'cloud-init.cfg')
         parms = {
+            'hostname': self.name,
             'user': self.user,
             'password': self.password,
             'ssh_key': self._get_ssh_key(),