ensure VMs always have /etc/hosts set up

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

diff --git a/teuthology/openstack/openstack-ubuntu-12.04-user-data.txt b/teuthology/openstack/openstack-ubuntu-12.04-user-data.txt
index 474e7aeb4c24c79ad7855b9eaefe9d2399d1082c..b0cf49a012b1dbd805f85f5cb9aab56ce7441fcc 100644 (file)
--- 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 b577ffa952ffa8a00f03fe88cdf999b7af8ed1ef..5163840d9d938f8563ad71d60ffd87d9966304c3 100644 (file)
--- 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 64bd915bdfa9e94f801c278a933bc514282f08f2..c8257e4fad5f93e335e92e22525fd3d7512388ac 100644 (file)
--- 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