mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-29 16:49:53 +00:00
Code Issues Releases Wiki Activity

hooks/ubuntu-cloud-prep: add hostname to meta-data

Browse Source 
prior to my enabling of the clone hook, the setting of the hostname
was being done by writing to /etc/hostname.  Instead of relying on that
we're now writing 'local-hostname' into the metadata for the instance.

cloud-init then reads this and sets the hostname properly.

We are also writing /etc/hostname with the new hostname explicitly.  This is
useful/necessary because on network bringup of eth0, dhclient will submit its
hosname.  The updating done by cloud-init occurs to late, and thus
the dhcp request goes out with the un-configured hostname and dns doens't
work correctly.

Signed-off-by: Scott Moser <smoser@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Scott Moser 2013-08-22 15:38:48 -04:00 committed by Serge Hallyn
parent 92b0b5bac5
commit cb0c6c0203
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/ubuntu-cloud-prep
View File

@ -49,8 +49,8 @@ prep() {
fi fi
local cur="" next="" local cur="" next=""
local userdata="" hostid="" authkey="" locales=1 cloud=0 name="" local userdata="" hostid="" authkey="" locales=1 cloud=0
local create_etc_init=0 local create_etc_init=0 name="ubuntucloud-lxc"
while [ $# -ne 0 ]; do while [ $# -ne 0 ]; do
cur="$1"; next="$2"; cur="$1"; next="$2";
@ -97,6 +97,10 @@ prep() {
local seed_d="" local seed_d=""
seed_d="$root_d/var/lib/cloud/seed/nocloud-net" seed_d="$root_d/var/lib/cloud/seed/nocloud-net"
echo "$name" > "$root_d/etc/hostname" ||
{ error "failed to write /etc/hostname"; return 1; }
if [ $cloud -eq 1 ]; then if [ $cloud -eq 1 ]; then
debug 1 "--cloud provided, not modifying seed in '$seed_d'" debug 1 "--cloud provided, not modifying seed in '$seed_d'"
else else
@ -110,6 +114,9 @@ prep() {
echo "instance-id: lxc-$hostid" > "$seed_d/meta-data" || echo "instance-id: lxc-$hostid" > "$seed_d/meta-data" ||
{ error "failed to write to $seed_d/meta-data"; return 1; } { error "failed to write to $seed_d/meta-data"; return 1; }
echo "local-hostname: $name" >> "$seed_d/meta-data" ||
{ error "failed to write to $seed_d/meta-data"; return 1; }
if [ -n "$authkey" ]; then if [ -n "$authkey" ]; then
{ {
echo "public-keys:" && echo "public-keys:" &&