diff options
| author | Robert Schweikert <rjschwei@suse.com> | 2017-11-08 15:45:53 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-11-10 17:05:39 -0500 |
| commit | 22a14a6a6d45ae55d2c2307d7b097eef9863bb0c (patch) | |
| tree | 5e8922298f5477b4d8f5cd90c78d3c5b1bd954ec /templates | |
| parent | 9bc4ce0596544ffa56d9d67245b00e07006a8662 (diff) | |
| download | vyos-cloud-init-22a14a6a6d45ae55d2c2307d7b097eef9863bb0c.tar.gz vyos-cloud-init-22a14a6a6d45ae55d2c2307d7b097eef9863bb0c.zip | |
hosts: Fix openSUSE and SLES setup for /etc/hosts and clarify docs.
The etc/hosts file is was not properly setup for openSUSE or SLES
when manage_etc_hosts is set in the config file.
Improve the doc to address the fact that the 'localhost' ip is
distribution dependent (not always 127.0.0.1).
LP: #1731022
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/hosts.opensuse.tmpl | 26 | ||||
| -rw-r--r-- | templates/hosts.suse.tmpl | 10 |
2 files changed, 8 insertions, 28 deletions
diff --git a/templates/hosts.opensuse.tmpl b/templates/hosts.opensuse.tmpl deleted file mode 100644 index 655da3f7..00000000 --- a/templates/hosts.opensuse.tmpl +++ /dev/null @@ -1,26 +0,0 @@ -* - This file /etc/cloud/templates/hosts.opensuse.tmpl is only utilized - if enabled in cloud-config. Specifically, in order to enable it - you need to add the following to config: - manage_etc_hosts: True -*# -# Your system has configured 'manage_etc_hosts' as True. -# As a result, if you wish for changes to this file to persist -# then you will need to either -# a.) make changes to the master file in -# /etc/cloud/templates/hosts.opensuse.tmpl -# b.) change or remove the value of 'manage_etc_hosts' in -# /etc/cloud/cloud.cfg or cloud-config from user-data -# -# The following lines are desirable for IPv4 capable hosts -127.0.0.1 localhost - -# The following lines are desirable for IPv6 capable hosts -::1 localhost ipv6-localhost ipv6-loopback -fe00::0 ipv6-localnet - -ff00::0 ipv6-mcastprefix -ff02::1 ipv6-allnodes -ff02::2 ipv6-allrouters -ff02::3 ipv6-allhosts - diff --git a/templates/hosts.suse.tmpl b/templates/hosts.suse.tmpl index b6082692..8e664dbf 100644 --- a/templates/hosts.suse.tmpl +++ b/templates/hosts.suse.tmpl @@ -13,12 +13,18 @@ you need to add the following to config: # /etc/cloud/cloud.cfg or cloud-config from user-data # # The following lines are desirable for IPv4 capable hosts -127.0.0.1 localhost +127.0.0.1 {{fqdn}} {{hostname}} +127.0.0.1 localhost.localdomain localhost +127.0.0.1 localhost4.localdomain4 localhost4 # The following lines are desirable for IPv6 capable hosts +::1 {{fqdn}} {{hostname}} +::1 localhost.localdomain localhost +::1 localhost6.localdomain6 localhost6 ::1 localhost ipv6-localhost ipv6-loopback -fe00::0 ipv6-localnet + +fe00::0 ipv6-localnet ff00::0 ipv6-mcastprefix ff02::1 ipv6-allnodes ff02::2 ipv6-allrouters |