diff options
| -rw-r--r-- | cloudinit/config/cc_set_hostname.py | 4 | ||||
| -rw-r--r-- | tools/.github-cla-signers | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/config/cc_set_hostname.py b/cloudinit/config/cc_set_hostname.py index 1d23d80d..d4017478 100644 --- a/cloudinit/config/cc_set_hostname.py +++ b/cloudinit/config/cc_set_hostname.py @@ -18,8 +18,8 @@ A hostname and fqdn can be provided by specifying a full domain name under the ``fqdn`` key. Alternatively, a hostname can be specified using the ``hostname`` key, and the fqdn of the cloud wil be used. If a fqdn specified with the ``hostname`` key, it will be handled properly, although it is better to use -the ``fqdn`` config key. If both ``fqdn`` and ``hostname`` are set, ``fqdn`` -will be used. +the ``fqdn`` config key. If both ``fqdn`` and ``hostname`` are set, +it is distro dependent whether ``hostname`` or ``fqdn`` is used. This module will run in the init-local stage before networking is configured if the hostname is set by metadata or user data on the local system. diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers index 689d7902..5dfa2eb3 100644 --- a/tools/.github-cla-signers +++ b/tools/.github-cla-signers @@ -37,6 +37,7 @@ slyon smoser sshedi TheRealFalcon +taoyama tnt-dev tomponline tsanghan |