summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/config/cc_phone_home.py7
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d7c2fc36..7bfd0c0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -104,6 +104,7 @@
- systemd: do not specify After of obsolete syslog.target (LP: #1536964)
- centos: Ensure that resolve conf object is written as a str (LP: #1479988)
- chef: straighten out validation_cert and validation_key (LP: #1568940)
+ - phone_home: allow usage of fqdn (LP: #1566824) [Ollie Armstrong]
0.7.6:
- open 0.7.6
diff --git a/cloudinit/config/cc_phone_home.py b/cloudinit/config/cc_phone_home.py
index 18a7ddad..3dcc9459 100644
--- a/cloudinit/config/cc_phone_home.py
+++ b/cloudinit/config/cc_phone_home.py
@@ -30,7 +30,8 @@ POST_LIST_ALL = [
'pub_key_rsa',
'pub_key_ecdsa',
'instance_id',
- 'hostname'
+ 'hostname',
+ 'fdqn'
]
@@ -41,7 +42,8 @@ POST_LIST_ALL = [
#
# phone_home:
# url: http://my.foo.bar/$INSTANCE_ID/
-# post: [ pub_key_dsa, pub_key_rsa, pub_key_ecdsa, instance_id
+# post: [ pub_key_dsa, pub_key_rsa, pub_key_ecdsa, instance_id, hostname,
+# fqdn ]
#
def handle(name, cfg, cloud, log, args):
if len(args) != 0:
@@ -74,6 +76,7 @@ def handle(name, cfg, cloud, log, args):
all_keys = {}
all_keys['instance_id'] = cloud.get_instance_id()
all_keys['hostname'] = cloud.get_hostname()
+ all_keys['fqdn'] = cloud.get_hostname(fqdn=True)
pubkeys = {
'pub_key_dsa': '/etc/ssh/ssh_host_dsa_key.pub',