diff options
| author | Abhijeet Kasurde <akasurde@redhat.com> | 2020-03-03 06:45:36 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 17:15:36 -0800 |
| commit | 449626feb558ff64cf801bd552f9f55b0999530b (patch) | |
| tree | 67b148d37c42e3deb671f92908d0e4c27ca6e428 | |
| parent | 9c17410f581cce1640f50f6d400b7d21c3c23d08 (diff) | |
| download | ansible-449626feb558ff64cf801bd552f9f55b0999530b.tar.gz | |
[2.9] hostname: Use hostnamectl for Systemd strategy (#67721)
Use hostnamectl command to get current hostname for host while using
systemd strategy.
Fixes: #67661
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
(cherry picked from commit 53aa258d78650317aae09328980801f9d338c0b5)
| -rw-r--r-- | changelogs/fragments/59438-hostname-use-hostnamectl.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/modules/system/hostname.py | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/changelogs/fragments/59438-hostname-use-hostnamectl.yml b/changelogs/fragments/59438-hostname-use-hostnamectl.yml new file mode 100644 index 0000000000..91182c30b2 --- /dev/null +++ b/changelogs/fragments/59438-hostname-use-hostnamectl.yml @@ -0,0 +1,2 @@ +bugfixes: + - Use hostnamectl command to get current hostname for host while using systemd strategy (https://github.com/ansible/ansible/issues/59438). diff --git a/lib/ansible/modules/system/hostname.py b/lib/ansible/modules/system/hostname.py index 698090f418..85dcb44b8e 100644 --- a/lib/ansible/modules/system/hostname.py +++ b/lib/ansible/modules/system/hostname.py @@ -155,8 +155,10 @@ class GenericStrategy(object): def __init__(self, module): self.module = module - self.hostname_cmd = self.module.get_bin_path('hostname', True) self.changed = False + self.hostname_cmd = self.module.get_bin_path('hostnamectl', False) + if not self.hostname_cmd: + self.hostname_cmd = self.module.get_bin_path('hostname', True) def update_current_and_permanent_hostname(self): self.update_current_hostname() @@ -374,7 +376,7 @@ class SystemdStrategy(GenericStrategy): """ def get_current_hostname(self): - cmd = ['hostname'] + cmd = [self.hostname_cmd, '--transient', 'status'] rc, out, err = self.module.run_command(cmd) if rc != 0: self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" % (rc, out, err)) @@ -383,13 +385,13 @@ class SystemdStrategy(GenericStrategy): def set_current_hostname(self, name): if len(name) > 64: self.module.fail_json(msg="name cannot be longer than 64 characters on systemd servers, try a shorter name") - cmd = ['hostnamectl', '--transient', 'set-hostname', name] + cmd = [self.hostname_cmd, '--transient', 'set-hostname', name] rc, out, err = self.module.run_command(cmd) if rc != 0: self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" % (rc, out, err)) def get_permanent_hostname(self): - cmd = ['hostnamectl', '--static', 'status'] + cmd = [self.hostname_cmd, '--static', 'status'] rc, out, err = self.module.run_command(cmd) if rc != 0: self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" % (rc, out, err)) @@ -398,11 +400,11 @@ class SystemdStrategy(GenericStrategy): def set_permanent_hostname(self, name): if len(name) > 64: self.module.fail_json(msg="name cannot be longer than 64 characters on systemd servers, try a shorter name") - cmd = ['hostnamectl', '--pretty', 'set-hostname', name] + cmd = [self.hostname_cmd, '--pretty', 'set-hostname', name] rc, out, err = self.module.run_command(cmd) if rc != 0: self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" % (rc, out, err)) - cmd = ['hostnamectl', '--static', 'set-hostname', name] + cmd = [self.hostname_cmd, '--static', 'set-hostname', name] rc, out, err = self.module.run_command(cmd) if rc != 0: self.module.fail_json(msg="Command failed rc=%d, out=%s, err=%s" % (rc, out, err)) |