diff options
| author | chengcheng-chcheng <63850735+chengcheng-chcheng@users.noreply.github.com> | 2020-05-08 01:01:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 11:01:22 -0600 |
| commit | b24b376fabd54e4dc96ffc1b90a984addf42fc4c (patch) | |
| tree | 88f0941528c83dd659b1c7fb9d55a842aa149d74 | |
| parent | 1c2d9881341f6335cc47a8a8d63df8759d8c2073 (diff) | |
| download | vyos-cloud-init-b24b376fabd54e4dc96ffc1b90a984addf42fc4c.tar.gz vyos-cloud-init-b24b376fabd54e4dc96ffc1b90a984addf42fc4c.zip | |
make suse and sles support 127.0.1.1 (#336)
Move from 127.0.0.1 to 127.0.1.1 for localhost IP addr for opensuse and sles
| -rw-r--r-- | cloudinit/distros/opensuse.py | 3 | ||||
| -rw-r--r-- | templates/hosts.suse.tmpl | 2 | ||||
| -rw-r--r-- | tests/unittests/test_handler/test_handler_etc_hosts.py | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/cloudinit/distros/opensuse.py b/cloudinit/distros/opensuse.py index dd56a3f4..68028d20 100644 --- a/cloudinit/distros/opensuse.py +++ b/cloudinit/distros/opensuse.py @@ -144,6 +144,9 @@ class Distro(distros.Distro): return default return hostname + def _get_localhost_ip(self): + return "127.0.1.1" + def _read_hostname_conf(self, filename): conf = HostnameConf(util.load_file(filename)) conf.parse() diff --git a/templates/hosts.suse.tmpl b/templates/hosts.suse.tmpl index 8e664dbf..5d7953f0 100644 --- a/templates/hosts.suse.tmpl +++ b/templates/hosts.suse.tmpl @@ -13,7 +13,7 @@ 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 {{fqdn}} {{hostname}} +127.0.1.1 {{fqdn}} {{hostname}} 127.0.0.1 localhost.localdomain localhost 127.0.0.1 localhost4.localdomain4 localhost4 diff --git a/tests/unittests/test_handler/test_handler_etc_hosts.py b/tests/unittests/test_handler/test_handler_etc_hosts.py index d854afcb..e3778b11 100644 --- a/tests/unittests/test_handler/test_handler_etc_hosts.py +++ b/tests/unittests/test_handler/test_handler_etc_hosts.py @@ -44,8 +44,8 @@ class TestHostsFile(t_help.FilesystemMockingTestCase): self.patchUtils(self.tmp) cc_update_etc_hosts.handle('test', cfg, cc, LOG, []) contents = util.load_file('%s/etc/hosts' % self.tmp) - if '127.0.0.1\tcloud-init.test.us\tcloud-init' not in contents: - self.assertIsNone('No entry for 127.0.0.1 in etc/hosts') + if '127.0.1.1\tcloud-init.test.us\tcloud-init' not in contents: + self.assertIsNone('No entry for 127.0.1.1 in etc/hosts') if '192.168.1.1\tblah.blah.us\tblah' not in contents: self.assertIsNone('Default etc/hosts content modified') @@ -64,7 +64,7 @@ class TestHostsFile(t_help.FilesystemMockingTestCase): self.patchUtils(self.tmp) cc_update_etc_hosts.handle('test', cfg, cc, LOG, []) contents = util.load_file('%s/etc/hosts' % self.tmp) - if '127.0.0.1 cloud-init.test.us cloud-init' not in contents: - self.assertIsNone('No entry for 127.0.0.1 in etc/hosts') + if '127.0.1.1 cloud-init.test.us cloud-init' not in contents: + self.assertIsNone('No entry for 127.0.1.1 in etc/hosts') if '::1 cloud-init.test.us cloud-init' not in contents: self.assertIsNone('No entry for 127.0.0.1 in etc/hosts') |