Merge lp:~zulcss/vmbuilder/vmbuilder-hostname into lp:vmbuilder/trunk

[Chuck Short]

[Chuck Short (zulcss)]

Let DHCP manage the hostname if its not specified.

[lp:~zulcss/vmbuilder/vmbuilder-hostname]

314. By Chuck Short on 2009-06-16

Better detection for DHCP

[Soren Hansen (soren)]

On Mon, Jun 15, 2009 at 06:15:15PM -0000, Chuck Short wrote:
> === modified file 'VMBuilder/plugins/ubuntu/dapper.py'
> --- VMBuilder/plugins/ubuntu/dapper.py 2009-06-10 13:40:41 +0000
> +++ VMBuilder/plugins/ubuntu/dapper.py 2009-06-15 18:11:35 +0000
> @@ -164,7 +164,8 @@
> return 'linux-image-%s' % (self.vm.flavour or self.default_flavour[self.vm.arch],)
>
> def config_network(self):
> - self.vm.install_file('/etc/hostname', self.vm.hostname)
> + if self.vm.hostname:
> + self.vm.install_file('/etc/hostname', self.vm.hostname)
> self.install_from_template('/etc/hosts', 'etc_hosts', { 'hostname' : self.vm.hostname, 'domain' : self.vm.domain })
> self.install_from_template('/etc/network/interfaces', 'interfaces')
>

Going throug the regular installer, don't we always end up with a
/etc/hostname ? The installer, AFAIK, invariably asks for the hostname
at least. I'd be surprised if it didn't put it in /etc/hostname, but
ICBW.

--
Soren Hansen |
Lead Virtualisation Engineer | Ubuntu Server Team
Canonical Ltd. | http://www.ubuntu.com/

[Eric Hammond (esh)]

Soren Hansen wrote:
> Going throug the regular installer, don't we always end up with a
> /etc/hostname ? The installer, AFAIK, invariably asks for the hostname
> at least. I'd be surprised if it didn't put it in /etc/hostname, but
> ICBW.

I'm not sure about the answer to the direct question, but Ubuntu on EC2
behaves better if /etc/hostname is omitted and it lets Amazon's DHCP
pick the hostname.

If /etc/hostname is set on an EC2 instance and that instance gets
rebundled into a new image, then all instances of that new image start
with the same old hostname instead of letting DHCP set it correctly again.

If the EC2 user decides to create /etc/hostname, that's their
prerogative, but the default and public images should not.

--
Eric Hammond
<email address hidden>

Unmerged revisions

314. By Chuck Short on 2009-06-16

Better detection for DHCP

313. By Chuck Short on 2009-06-15

Let DHCP set the hostname if its not specified

=== modified file 'VMBuilder/plugins/ubuntu/dapper.py'
--- VMBuilder/plugins/ubuntu/dapper.py	2009-06-10 13:40:41 +0000
+++ VMBuilder/plugins/ubuntu/dapper.py	2009-06-15 18:11:35 +0000
@@ -164,7 +164,8 @@
         return 'linux-image-%s' % (self.vm.flavour or self.default_flavour[self.vm.arch],)
 
     def config_network(self):
-        self.vm.install_file('/etc/hostname', self.vm.hostname)
+        if self.vm.hostname:
+            self.vm.install_file('/etc/hostname', self.vm.hostname)
         self.install_from_template('/etc/hosts', 'etc_hosts', { 'hostname' : self.vm.hostname, 'domain' : self.vm.domain }) 
         self.install_from_template('/etc/network/interfaces', 'interfaces')
 

=== modified file 'VMBuilder/plugins/ubuntu/templates/etc_hosts.tmpl'
--- VMBuilder/plugins/ubuntu/templates/etc_hosts.tmpl	2008-09-18 09:11:09 +0000
+++ VMBuilder/plugins/ubuntu/templates/etc_hosts.tmpl	2009-06-15 18:11:35 +0000
@@ -1,5 +1,7 @@
 127.0.0.1 localhost
+#if $hostname
 127.0.1.1 $hostname.$domain $hostname
+#endif
 
 # The following lines are desirable for IPv6 capable hosts
 ::1 ip6-localhost ip6-loopback