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

[Robert Schweikert]

As promised a while ago, I investigated the questionable condition for SUSE based distros in cloud-init-local.service. This is the fix/result of the investigation the condition for Before=basic.target should not exist.

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

PASSED: Continuous integration, rev:15baabd39e602cf12b2030eed6b24ab22f94e49e
https://jenkins.ubuntu.com/server/job/cloud-init-ci/514/
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/514/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

LGTM

review: Approve

[Scott Moser (smoser)]

I'll rewrite the commit message to be

 Subjectm ...
 <blank linke>
 description

and then will pull this.

review: Approve

diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
index bf6b296..ff9c644 100644
--- a/systemd/cloud-init-local.service.tmpl
+++ b/systemd/cloud-init-local.service.tmpl
@@ -13,12 +13,6 @@ Before=shutdown.target
 Before=sysinit.target
 Conflicts=shutdown.target
 {% endif %}
-{% if variant in ["suse"] %}
-# Other distros use Before=sysinit.target. There is not a clearly identified
-# reason for usage of basic.target instead.
-Before=basic.target
-Conflicts=shutdown.target
-{% endif %}
 RequiresMountsFor=/var/lib/cloud
 
 [Service]