Merge ~nrezinorn/cloud-init:fix_systemd_hostname into cloud-init:master

[Jim Gorz]

cloud-init was not properly running hostnamectl on first boot. this fixes the systemd handling logic and works :)

[Joshua Harlow (harlowja)]

review: Approve

[Scott Moser (smoser)]

It seems to me that we should not be calling
 ['hostnamectl', 'set-hostname', str(hostname)]
from _write_hostname at all

but rather from _apply_hostname.

Can you please test a change made where we drop the call to hostnamectl here, and instead do it in _apply_hostname ?

review: Needs Information

[Scott Moser (smoser)]

also, please "set commit message" with a overall change message , and a line at the end with:

LP: #1424710

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

FAILED: Continuous integration, rev:bd571d69c11fb37884152b98f82f5683f18287aa
https://jenkins.ubuntu.com/server/job/cloud-init-ci/86/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/86
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/86/console
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/86
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-amd64/86
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/86

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

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

Hi,
I've moved this to work in progress. Please respond to the question above and move back to 'Needs Review'. Thanks.
Scott

Unmerged commits

bd571d6... by Jim Gorz <email address hidden> on 2016-09-22

fix: hostnamectl occurs every time as expected now

diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index 1aa42d7..c4b19d1 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -135,9 +135,9 @@ class Distro(distros.Distro):
     def _write_hostname(self, hostname, out_fn):
         # systemd will never update previous-hostname for us, so
         # we need to do it ourselves
-        if self.uses_systemd() and out_fn.endswith('/previous-hostname'):
-            util.write_file(out_fn, hostname)
-        elif self.uses_systemd():
+        if self.uses_systemd():
+            if out_fn.endswith('/previous-hostname'):
+                util.write_file(out_fn, hostname)
             util.subp(['hostnamectl', 'set-hostname', str(hostname)])
         else:
             host_cfg = {