From 1358018b41eafcce8f22df21bfc6011dbd079a95 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Tue, 8 Dec 2015 01:53:10 +0100 Subject: [PATCH] ensure VMs always have /etc/hosts set up Signed-off-by: Robin H. Johnson --- teuthology/openstack/openstack-ubuntu-12.04-user-data.txt | 1 + teuthology/openstack/openstack-ubuntu-14.04-user-data.txt | 1 + teuthology/openstack/openstack-user-data.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/teuthology/openstack/openstack-ubuntu-12.04-user-data.txt b/teuthology/openstack/openstack-ubuntu-12.04-user-data.txt index 474e7aeb4..b0cf49a01 100644 --- a/teuthology/openstack/openstack-ubuntu-12.04-user-data.txt +++ b/teuthology/openstack/openstack-ubuntu-12.04-user-data.txt @@ -8,6 +8,7 @@ bootcmd: - hostname $(cat /etc/hostname) - echo "MaxSessions 1000" >> /etc/ssh/sshd_config preserve_hostname: true +manage_etc_hosts: true system_info: default_user: name: {username} diff --git a/teuthology/openstack/openstack-ubuntu-14.04-user-data.txt b/teuthology/openstack/openstack-ubuntu-14.04-user-data.txt index b577ffa95..5163840d9 100644 --- a/teuthology/openstack/openstack-ubuntu-14.04-user-data.txt +++ b/teuthology/openstack/openstack-ubuntu-14.04-user-data.txt @@ -7,6 +7,7 @@ bootcmd: - ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname - hostname $(cat /etc/hostname) - echo "MaxSessions 1000" >> /etc/ssh/sshd_config +manage_etc_hosts: true preserve_hostname: true system_info: default_user: diff --git a/teuthology/openstack/openstack-user-data.txt b/teuthology/openstack/openstack-user-data.txt index 64bd915bd..c8257e4fa 100644 --- a/teuthology/openstack/openstack-user-data.txt +++ b/teuthology/openstack/openstack-user-data.txt @@ -2,6 +2,7 @@ bootcmd: - touch /tmp/init.out - echo nameserver 8.8.8.8 | sudo tee -a /etc/resolv.conf # last resort, in case the DHCP server does not provide a resolver +manage_etc_hosts: true system_info: default_user: name: TEUTHOLOGY_USERNAME -- 2.47.3