diff options
| author | harlowja <harlowja@virtualbox.rhel> | 2013-02-21 22:51:02 -0800 |
|---|---|---|
| committer | harlowja <harlowja@virtualbox.rhel> | 2013-02-21 22:51:02 -0800 |
| commit | 575a084808db7d5ac607a848b018abe676e73a91 (patch) | |
| tree | 34e179b0623074e6cd6fc03e4b3db001f8e493bf /cloudinit/config/cc_set_hostname.py | |
| parent | 9dfb60d3144860334ab1ad1d72920d962139461f (diff) | |
| parent | d4886b65549c886499141872a9928412a74bbea2 (diff) | |
| download | vyos-cloud-init-575a084808db7d5ac607a848b018abe676e73a91.tar.gz vyos-cloud-init-575a084808db7d5ac607a848b018abe676e73a91.zip | |
Update to code on trunk.
Diffstat (limited to 'cloudinit/config/cc_set_hostname.py')
| -rw-r--r-- | cloudinit/config/cc_set_hostname.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cloudinit/config/cc_set_hostname.py b/cloudinit/config/cc_set_hostname.py index b0f27ebf..2b32fc94 100644 --- a/cloudinit/config/cc_set_hostname.py +++ b/cloudinit/config/cc_set_hostname.py @@ -27,9 +27,11 @@ def handle(name, cfg, cloud, log, _args): " not setting the hostname in module %s"), name) return - (hostname, _fqdn) = util.get_hostname_fqdn(cfg, cloud) + (hostname, fqdn) = util.get_hostname_fqdn(cfg, cloud) try: - log.debug("Setting hostname to %s", hostname) - cloud.distro.set_hostname(hostname) + log.debug("Setting the hostname to %s (%s)", fqdn, hostname) + cloud.distro.set_hostname(hostname, fqdn) except Exception: - util.logexc(log, "Failed to set hostname to %s", hostname) + util.logexc(log, "Failed to set the hostname to %s (%s)", + fqdn, hostname) + raise |