Re: [Cloud-init-dev] [Merge] ~chad.smith/cloud-init:ci-deps into cloud-init:master
@scott I think I've addressed all comments here
Diff comments:
> diff --git a/packages/pkg-deps.json b/packages/pkg-deps.json
> new file mode 100644
> index 000..2100ec7
> --- /dev/null
> +++ b/packages/pkg-deps.json
> @@ -0,0 +1,84 @@
> +{
> + "debian" : {
> + "build-requires" : [
> + "debhelper",
> + "dh-python",
> + "dh-systemd"
> + ],
> + "renames" : {
> + "pep8" : {
> +"2" : "pep8",
dropped as we are only looking to support xenial and greater currently for pkg
builds etc. We can deal with this if we have to SRU to trusty for a customer
> +"3" : "python3-pep8"
> + },
> + "pyflakes" : {
Good points, since master is really only generally targeting (via SRUs) xenial
and above I've dropped some renames that don't matter anymore. We can add more
distro-specific pkg renames in if end up having to pull a giant SRU into trusty.
> +"2" : "pyflakes",
> +"3" : "pyflakes"
> + },
> + "pyyaml" : {
> +"2" : "python-yaml",
> +"3" : "python3-yaml"
> + },
> + "six" : {
> +"2" : "python-six",
yep removed.
> +"3" : "python3-six"
> + },
> + "contextlib2" : {
> +"2" : "python-contextlib2",
> +"3" : null
> + },
> + "pyserial" : {
> +"2" : "python-serial",
> +"3" : "python3-serial"
> + }
> + },
> + "requires" : [
> + "procps"
> + ]
> + },
> + "redhat" : {
> + "build-requires" : [
> + "python-devel",
> + "python-setuptools"
> + ],
> + "renames" : {
> + "pyyaml" : {
> +"2" : "PyYAML",
null means use default.
> +"3" : null
> + },
> + "pyserial" : {
> +"2" : "pyserial",
> +"3" : null
> + }
Yeah strange I can't find pyserial either on centos, though I see references to
it at http://pyserial.readthedocs.io/en/latest/pyserial.html. We also have the
expectation of that missing deps within a try/except ImportError block so we
are good not documenting it.
> + },
> + "requires" : [
> + "e2fsprogs",
> + "iproute",
> + "net-tools",
> + "procps",
> + "rsyslog",
> + "shadow-utils",
> + "sudo >= 1.7.2p2-3"
> + ]
> + },
> + "suse" : {
> + "renames" : {
> + "pyyaml" : {
> +"2" : "python-yaml",
> +"3" : null
> + }
> + },
> + "build-requires" : [
> + "fdupes",
> + "filesystem",
> + "python-devel",
> + "python-setuptools"
> + ],
> + "requires" : [
> + "iproute2",
> + "e2fsprogs",
> + "net-tools",
> + "procps",
> + "sudo"
> + ]
> + }
> +}
--
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/325342
Your team cloud-init commiters is requested to review the proposed merge of
~chad.smith/cloud-init:ci-deps into cloud-init:master.
___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master
The proposal to merge ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master has been updated. Commit Message changed to: systemd: make cloud-final.service run before apt daily services. This changes all cloud-init systemd units to run 'Before' the apt processes that run daily and may cause a lock on the apt database. apt-daily-upgrade.service contains 'After=apt-daily.service'. Per systemd man page: Timer units automatically gain a Before= dependency on the service they are supposed to activate. Thus following order is enforced, so we can just be 'Before' the first. apt-daily.timer apt-daily.service apt-daily-upgrade.timer apt-daily-upgrade.service Note that this means only that apt-daily* will not run until cloud-init has entirely finished. Any other processes running apt-get operations are still affected by the global lock. LP: #1693361 For more details, see: https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/325513 -- Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master
The proposal to merge ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master has been updated. Commit Message changed to: systemd: make cloud-final.service run before apt daily services. This is really just a work around for apt. The solution here is to cause cloud-init-final.service to run Before the processes that run daily and may cause a lock on the apt database. apt-daily-upgrade.service contains 'After=apt-daily.service'. Per systemd man page: Timer units automatically gain a Before= dependency on the service they are supposed to activate. Thus following order is enforced, so we can just be 'Before' the first. apt-daily.timer apt-daily.service apt-daily-upgrade.timer apt-daily-upgrade.service LP: #1693361 For more details, see: https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/325513 -- Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master
Review: Needs Information Would it make more sense logically to be Before=apt-daily.service (the thing that actually takes the conflicting lock), rather than Before=apt-daily.timer? I don't agree with characterizing this as a "workaround", because even if we had perfect handling of apt locks, we would still care about cloud-init being done *before* apt-daily such that the first boot could finish in a timely manner. -- https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/325513 Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master
Scott Moser has proposed merging ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master. Commit message: systemd: make cloud-final.service run before apt daily services. This is really just a work around for apt. The solution here is to cause cloud-init-final.service to run Before the processes that run daily and may cause a lock on the apt database. apt-daily-upgrade.service contains 'After=apt-daily.service'. Per systemd man page: Timer units automatically gain a Before= dependency on the service they are supposed to activate. Thus following order is enforced, so we can just be 'Before' the first. apt-daily.timer apt-daily.service apt-daily-upgrade.timer apt-daily-upgrade.service Requested reviews: Steve Langasek (vorlon) cloud-init commiters (cloud-init-dev) Related bugs: Bug #1693361 in cloud-init: "cloud-init sometimes fails on dpkg lock due to concurrent apt-daily.service execution" https://bugs.launchpad.net/cloud-init/+bug/1693361 For more details, see: https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/325513 -- Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:bug/1693361-apt-get-locks into cloud-init:master. diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service index b8f69b7..4bda2ba 100644 --- a/systemd/cloud-final.service +++ b/systemd/cloud-final.service @@ -2,6 +2,7 @@ Description=Execute cloud user/final scripts After=network-online.target cloud-config.service rc-local.service multi-user.target Wants=network-online.target cloud-config.service +Before=apt-daily.timer [Service] Type=oneshot ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~ajorgens/cloud-init:pipe-cat into cloud-init:master
Review: Approve continuous-integration PASSED: Continuous integration, rev:c97434e6c94690a0df292a70fd5ed6f5f0a389fa https://jenkins.ubuntu.com/server/job/cloud-init-ci/517/ Executed test runs: SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/517 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/517 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/517 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/517 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/517 Click here to trigger a rebuild: https://jenkins.ubuntu.com/server/job/cloud-init-ci/517/rebuild -- https://code.launchpad.net/~ajorgens/cloud-init/+git/cloud-init/+merge/325512 Your team cloud-init commiters is requested to review the proposed merge of ~ajorgens/cloud-init:pipe-cat into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~ajorgens/cloud-init:fix-gratuitous-templating into cloud-init:master
Review: Approve continuous-integration PASSED: Continuous integration, rev:657157dd172275b73b06816b5fc14df904754ae8 https://jenkins.ubuntu.com/server/job/cloud-init-ci/516/ Executed test runs: SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/516 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/516 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/516 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/516 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/516 Click here to trigger a rebuild: https://jenkins.ubuntu.com/server/job/cloud-init-ci/516/rebuild -- https://code.launchpad.net/~ajorgens/cloud-init/+git/cloud-init/+merge/325511 Your team cloud-init commiters is requested to review the proposed merge of ~ajorgens/cloud-init:fix-gratuitous-templating into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~chad.smith/cloud-init:schema-autodoc into cloud-init:master
Chad Smith has proposed merging ~chad.smith/cloud-init:schema-autodoc into
cloud-init:master.
Commit message:
docs: Automatically generate module docs form schema attribute if present
We have started adding jsonschema defintions for cloudconfig modules (cc_ntp).
This branch allows us render sphinx docs using the module's shema definition
instead of using the module's docstring.
It allows us to generate our module documentation directly from the schema
definition and avoid duplicating that documentation in the module-level
docstring. The corresponding module documentation is extended a bit to
differentiate between config schema and potential examples.
Requested reviews:
cloud-init commiters (cloud-init-dev)
For more details, see:
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/325507
docs: Automatically generate module docs form schema attribute if present
We have started adding jsonschema defintions for cloudconfig modules (cc_ntp).
This branch allows us render sphinx docs using the module's shema definition
instead of using the module's docstring.
It allows us to generate our module documentation directly from the schema
definition and avoid duplicating that documentation in the module-level
docstring. The corresponding module documentation is extended a bit to
differentiate between config schema and potential examples.
To test:
tox -e docs
xdg-open doc/rtd_html/topics/modules.html # look over the cc_ntp module
# merge this branch and remove part of the module docstring
cloudinit/config/cc_ntp.py
xdg-open doc/rtd_html/topics/modules.html # to view the differences in
styling and content of cc_ntp
--
Your team cloud-init commiters is requested to review the proposed merge of
~chad.smith/cloud-init:schema-autodoc into cloud-init:master.
diff --git a/doc/rtd/conf.py b/doc/rtd/conf.py
index 66b3b65..0ea3b6b 100644
--- a/doc/rtd/conf.py
+++ b/doc/rtd/conf.py
@@ -10,6 +10,7 @@ sys.path.insert(0, os.path.abspath('./'))
sys.path.insert(0, os.path.abspath('.'))
from cloudinit import version
+from cloudinit.config.schema import get_schema_doc
# Supress warnings for docs that aren't used yet
# unused_docs = [
@@ -75,3 +76,12 @@ html_theme_options = {
# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
html_logo = 'static/logo.png'
+
+def generate_docstring_from_schema(app, what, name, obj, options, lines):
+"""Override module docs from schema when present."""
+if what == 'module' and hasattr(obj, "schema"):
+del lines[:]
+lines.extend(get_schema_doc(obj.schema).split('\n'))
+
+def setup(app):
+app.connect('autodoc-process-docstring', generate_docstring_from_schema)
___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~chad.smith/cloud-init:schema-autodoc into cloud-init:master
The proposal to merge ~chad.smith/cloud-init:schema-autodoc into cloud-init:master has been updated. Commit Message changed to: docs: Automatically generate module docs form schema attribute if present We have started adding jsonschema defintions for cloudconfig modules (cc_ntp). This branch allows us render sphinx docs using the module's shema definition instead of using the module's docstring. It allows us to generate our module documentation directly from the schema definition and avoid duplicating that documentation in the module-level docstring. The corresponding module documentation is extended a bit to differentiate between config schema and potential examples. For more details, see: https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/325507 -- Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:schema-autodoc into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~chad.smith/cloud-init:ci-deps into cloud-init:master
Review: Approve continuous-integration PASSED: Continuous integration, rev:0885377d86d1038d2e50b0dda5f692ba0edb https://jenkins.ubuntu.com/server/job/cloud-init-ci/512/ Executed test runs: SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/512 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/512 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/512 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/512 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/512 Click here to trigger a rebuild: https://jenkins.ubuntu.com/server/job/cloud-init-ci/512/rebuild -- https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/325342 Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:ci-deps into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~redriver/cloud-init:fix-mount-issue-for-frbsd-on-Azure into cloud-init:master
Hi, So I think the basic idea here is to attempt to mount the cdrom to verify that there is in fact a cdrom. Thats not an entirely bad idea, but it seems like it might be sufficient to either: a.) always add 'dev/cd0' on freebsd and let the code in get_data just attempt to mount, which means we would not be mounting the thing twice. b.) attempt an 'open' and read of /dev/cd0. this would be quicker than a mount, and at least on linux the 'open' would fail if the cdrom does not have any disk in it. ie: if util.is_FreeBSD(): cdrom_dev = "/dev/cd0" try: with open(cdrom_dev) as fp: fp.read(1024) devlist.append(cdrom_dev) except IOError: pass -- https://code.launchpad.net/~redriver/cloud-init/+git/cloud-init/+merge/325207 Your team cloud-init commiters is requested to review the proposed merge of ~redriver/cloud-init:fix-mount-issue-for-frbsd-on-Azure into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~b1sandmann/cloud-init:fix-hostnames-for-suse into cloud-init:master
Review: Approve continuous-integration PASSED: Continuous integration, rev:6cf2c094e038e7f2e6c185a463e9d95767075a64 https://jenkins.ubuntu.com/server/job/cloud-init-ci/511/ Executed test runs: SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/511 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/511 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/511 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/511 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/511 Click here to trigger a rebuild: https://jenkins.ubuntu.com/server/job/cloud-init-ci/511/rebuild -- https://code.launchpad.net/~b1sandmann/cloud-init/+git/cloud-init/+merge/325476 Your team cloud-init commiters is requested to review the proposed merge of ~b1sandmann/cloud-init:fix-hostnames-for-suse into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~b1sandmann/cloud-init:fix-debian-template into cloud-init:master
Review: Approve continuous-integration PASSED: Continuous integration, rev:3a2b706697ddc21d8ef2649f5a350da74cc920ef https://jenkins.ubuntu.com/server/job/cloud-init-ci/510/ Executed test runs: SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/510 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/510 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/510 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/510 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/510 Click here to trigger a rebuild: https://jenkins.ubuntu.com/server/job/cloud-init-ci/510/rebuild -- https://code.launchpad.net/~b1sandmann/cloud-init/+git/cloud-init/+merge/325478 Your team cloud-init commiters is requested to review the proposed merge of ~b1sandmann/cloud-init:fix-debian-template into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~b1sandmann/cloud-init:fix-debian-template into cloud-init:master
The proposal to merge ~b1sandmann/cloud-init:fix-debian-template into cloud-init:master has been updated. Description changed to: The comments in the debian template file of /etc/hosts still pointed to a general template file instead of the debian one. Fixes bug 1606406 For more details, see: https://code.launchpad.net/~b1sandmann/cloud-init/+git/cloud-init/+merge/325478 -- Your team cloud-init commiters is requested to review the proposed merge of ~b1sandmann/cloud-init:fix-debian-template into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~b1sandmann/cloud-init:fix-debian-template into cloud-init:master
Jens Sandmann has proposed merging ~b1sandmann/cloud-init:fix-debian-template
into cloud-init:master.
Requested reviews:
cloud-init commiters (cloud-init-dev)
For more details, see:
https://code.launchpad.net/~b1sandmann/cloud-init/+git/cloud-init/+merge/325478
The comments in the debian template file of /etc/hosts still pointed to a
general template file instead of the debian one. Fixex bug 1606406
--
Your team cloud-init commiters is requested to review the proposed merge of
~b1sandmann/cloud-init:fix-debian-template into cloud-init:master.
diff --git a/templates/hosts.debian.tmpl b/templates/hosts.debian.tmpl
index a1d9721..7e29907 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
#
___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~b1sandmann/cloud-init:fix-hostnames-for-suse into cloud-init:master
Jens Sandmann has proposed merging
~b1sandmann/cloud-init:fix-hostnames-for-suse into cloud-init:master.
Requested reviews:
cloud-init commiters (cloud-init-dev)
For more details, see:
https://code.launchpad.net/~b1sandmann/cloud-init/+git/cloud-init/+merge/325476
Add the hostname and fully qualified domain name to the /etc/hosts suse
template. The other templates already included this lines but somehow suse did
not.
--
Your team cloud-init commiters is requested to review the proposed merge of
~b1sandmann/cloud-init:fix-hostnames-for-suse into cloud-init:master.
diff --git a/templates/hosts.suse.tmpl b/templates/hosts.suse.tmpl
index b608269..399ec9b 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
___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help : https://help.launchpad.net/ListHelp
