Merge ~rjschwei/cloud-init:tmplExpand into cloud-init:master

[Robert Schweikert]

suse: updates to templates to support openSUSE and SLES.

Things done here:
 - identify 'suse' as a variant in util.system_info and
   also tools/render-cloudcfg.
 - update systemd and cloud.cfg templates for suse specific changes.

LP: #1718640

Integrate SUSE distros for template expansion of systemd and default config.

[Scott Moser (smoser)]

over all, changes look fine. two questions inline.

[Scott Moser (smoser)]

OK, i really would like to have some response to my inline comments.
Additionally, I put together this change:
 http://paste.ubuntu.com/25587466/
that i'd like added.

And I updated the Commit message.

So, if i can get some feedback on
  * 'basic.target' versus 'sysinit.target',
  * dbus.service

then I can pull this into the release.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:73acbf4a00741f8b9b4b278120b6119b83d28b03
https://jenkins.ubuntu.com/server/job/cloud-init-ci/347/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/347/rebuild

review: Approve (continuous-integration)

diff --git a/cloudinit/util.py b/cloudinit/util.py
index 4c01f44..e1290aa 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -598,6 +598,8 @@ def system_info():
             var = 'ubuntu'
         elif linux_dist == 'redhat':
             var = 'rhel'
+        elif linux_dist == 'suse':
+            var = 'suse'
         else:
             var = 'linux'
     elif system in ('windows', 'darwin', "freebsd"):
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
index a537d65..e6b20ef 100644
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
@@ -127,7 +127,7 @@ cloud_final_modules:
 # (not accessible to handlers/transforms)
 system_info:
    # This will affect which distro class gets used
-{% if variant in ["centos", "debian", "fedora", "rhel", "ubuntu", "freebsd"] %}
+{% if variant in ["centos", "debian", "fedora", "rhel", "suse", "ubuntu", "freebsd"] %}
    distro: {{ variant }}
 {% else %}
    # Unknown/fallback distro.
@@ -186,4 +186,18 @@ system_info:
      groups: [wheel]
      sudo: ["ALL=(ALL) NOPASSWD:ALL"]
      shell: /bin/tcsh
+{% elif variant in ["suse"] %}
+   # Default user name + that default users groups (if added/used)
+   default_user:
+     name: {{ variant }}
+     lock_passwd: True
+     gecos: {{ variant }} Cloud User
+     groups: [cdrom, users]
+     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+     shell: /bin/bash
+   # Other config here will be given to the distro class and/or path classes
+   paths:
+      cloud_dir: /var/lib/cloud/
+      templates_dir: /etc/cloud/templates/
+   ssh_svcname: sshd
 {% endif %}
diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
index ff9c644..870ccf1 100644
--- a/systemd/cloud-init-local.service.tmpl
+++ b/systemd/cloud-init-local.service.tmpl
@@ -13,6 +13,10 @@ Before=shutdown.target
 Before=sysinit.target
 Conflicts=shutdown.target
 {% endif %}
+{% if variant in ["suse"] %}
+Before=basic.target
+Conflicts=shutdown.target
+{% endif %}
 RequiresMountsFor=/var/lib/cloud
 
 [Service]
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
index 2c71889..0dd45e5 100644
--- a/systemd/cloud-init.service.tmpl
+++ b/systemd/cloud-init.service.tmpl
@@ -13,6 +13,11 @@ After=networking.service
 {% if variant in ["centos", "fedora", "redhat"] %}
 After=network.service
 {% endif %}
+{% if variant in ["suse"] %}
+Requires=wicked.service
+After=wicked.service
+After=dbus.service
+{% endif %}
 Before=network-online.target
 Before=sshd-keygen.service
 Before=sshd.service
@@ -20,6 +25,9 @@ Before=sshd.service
 Before=sysinit.target
 Conflicts=shutdown.target
 {% endif %}
+{% if variant in ["suse"] %}
+Conflicts=shutdown.target
+{% endif %}
 Before=systemd-user-sessions.service
 
 [Service]