diff options
| author | Chad Smith <chad.smith@canonical.com> | 2017-11-21 11:43:26 -0700 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2017-11-21 11:43:26 -0700 |
| commit | 5b974bbab161e6cd73751bf27b7741f6b0d19051 (patch) | |
| tree | f634411a9b12b2e36ff8beefbec39dad21cd45ea /cloudinit/config/cc_update_etc_hosts.py | |
| parent | c9c7ff70f55ee024dd54336f07ba52acec1f6929 (diff) | |
| parent | 7624348712b4502f0085d30c05b34dce3f2ceeae (diff) | |
| download | vyos-cloud-init-5b974bbab161e6cd73751bf27b7741f6b0d19051.tar.gz vyos-cloud-init-5b974bbab161e6cd73751bf27b7741f6b0d19051.zip | |
merge from 7624348712b4502f0085d30c05b34dce3f2ceeae at 17.1-41-g76243487
Diffstat (limited to 'cloudinit/config/cc_update_etc_hosts.py')
| -rw-r--r-- | cloudinit/config/cc_update_etc_hosts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_update_etc_hosts.py b/cloudinit/config/cc_update_etc_hosts.py index b3947849..c96eede1 100644 --- a/cloudinit/config/cc_update_etc_hosts.py +++ b/cloudinit/config/cc_update_etc_hosts.py @@ -23,8 +23,8 @@ using the template located in ``/etc/cloud/templates/hosts.tmpl``. In the If ``manage_etc_hosts`` is set to ``localhost``, then cloud-init will not rewrite ``/etc/hosts`` entirely, but rather will ensure that a entry for the -fqdn with ip ``127.0.1.1`` is present in ``/etc/hosts`` (i.e. -``ping <hostname>`` will ping ``127.0.1.1``). +fqdn with a distribution dependent ip is present in ``/etc/hosts`` (i.e. +``ping <hostname>`` will ping ``127.0.0.1`` or ``127.0.1.1`` or other ip). .. note:: if ``manage_etc_hosts`` is set ``true`` or ``template``, the contents |