diff options
| author | Scott Moser <smoser@brickies.net> | 2017-07-31 14:46:00 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-07-31 14:46:00 -0400 |
| commit | 19c248d009af6a7cff26fbb2febf5c958987084d (patch) | |
| tree | 521cc4c8cd303fd7a9eb56bc4eb5975c48996298 /templates | |
| parent | f47c7ac027fc905ca7f6bee776007e2a922c117e (diff) | |
| parent | e586fe35a692b7519000005c8024ebd2bcbc82e0 (diff) | |
| download | vyos-cloud-init-19c248d009af6a7cff26fbb2febf5c958987084d.tar.gz vyos-cloud-init-19c248d009af6a7cff26fbb2febf5c958987084d.zip | |
merge from master at 0.7.9-233-ge586fe35
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/hosts.debian.tmpl | 4 | ||||
| -rw-r--r-- | templates/hosts.suse.tmpl | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/templates/hosts.debian.tmpl b/templates/hosts.debian.tmpl index a1d97212..7e29907a 100644 --- a/templates/hosts.debian.tmpl +++ b/templates/hosts.debian.tmpl @@ -1,6 +1,6 @@ ## template:jinja {# -This file (/etc/cloud/templates/hosts.tmpl) is only utilized +This file (/etc/cloud/templates/hosts.debian.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 @@ -8,7 +8,7 @@ you need to add the following to config: # 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.tmpl +# a.) make changes to the master file in /etc/cloud/templates/hosts.debian.tmpl # b.) change or remove the value of 'manage_etc_hosts' in # /etc/cloud/cloud.cfg or cloud-config from user-data # diff --git a/templates/hosts.suse.tmpl b/templates/hosts.suse.tmpl index b6082692..399ec9b4 100644 --- a/templates/hosts.suse.tmpl +++ b/templates/hosts.suse.tmpl @@ -14,9 +14,12 @@ you need to add the following to config: # # The following lines are desirable for IPv4 capable hosts 127.0.0.1 localhost +127.0.0.1 {{fqdn}} {{hostname}} + # The following lines are desirable for IPv6 capable hosts ::1 localhost ipv6-localhost ipv6-loopback +::1 {{fqdn}} {{hostname}} fe00::0 ipv6-localnet ff00::0 ipv6-mcastprefix |