diff -Nru cloud-init-0.7.5/debian/changelog cloud-init-0.7.5/debian/changelog --- cloud-init-0.7.5/debian/changelog 2014-10-02 10:59:46.000000000 -0600 +++ cloud-init-0.7.5/debian/changelog 2015-01-14 06:59:35.000000000 -0700 @@ -1,3 +1,10 @@ +cloud-init (0.7.5-0ubuntu1.4) trusty; urgency=medium + + * d/patches/lp-1383794-gce-short_name.patch: Use short hostname for GCE + (LP: #1383794). + + -- Ben Howard Tue, 21 Oct 2014 14:52:36 -0600 + cloud-init (0.7.5-0ubuntu1.3) trusty-proposed; urgency=medium * d/patches/lp-1336855-grub_xvda.patch: include xvda devices for diff -Nru cloud-init-0.7.5/debian/patches/lp-1383794-gce-short_name.patch cloud-init-0.7.5/debian/patches/lp-1383794-gce-short_name.patch --- cloud-init-0.7.5/debian/patches/lp-1383794-gce-short_name.patch 1969-12-31 17:00:00.000000000 -0700 +++ cloud-init-0.7.5/debian/patches/lp-1383794-gce-short_name.patch 2015-01-14 06:59:35.000000000 -0700 @@ -0,0 +1,37 @@ +Description: Use the shortname for GCE + GCE FDQN's may exceed 64 characters. A number of programs like Hadoop, + Easyrsa, Java, etc., have issues with long hostnames. +Author: Ben Howard +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1383794 +--- a/cloudinit/sources/DataSourceGCE.py ++++ b/cloudinit/sources/DataSourceGCE.py +@@ -115,7 +115,8 @@ + return self.metadata['public-keys'] + + def get_hostname(self, fqdn=False, _resolve_ip=False): +- return self.metadata['local-hostname'] ++ # GCE has long FDQN's and has asked for short hostnames ++ return self.metadata['local-hostname'].split('.')[0] + + def get_userdata_raw(self): + return self.metadata['user-data'] +--- a/tests/unittests/test_datasource/test_gce.py ++++ b/tests/unittests/test_datasource/test_gce.py +@@ -80,7 +80,8 @@ + body=_request_callback) + self.ds.get_data() + +- self.assertEqual(GCE_META.get('instance/hostname'), ++ shostname = GCE_META.get('instance/hostname').split('.')[0] ++ self.assertEqual(shostname, + self.ds.get_hostname()) + + self.assertEqual(GCE_META.get('instance/id'), +@@ -107,5 +108,5 @@ + self.assertEqual(GCE_META_PARTIAL.get('instance/id'), + self.ds.get_instance_id()) + +- self.assertEqual(GCE_META_PARTIAL.get('instance/hostname'), +- self.ds.get_hostname()) ++ shostname = GCE_META_PARTIAL.get('instance/hostname').split('.')[0] ++ self.assertEqual(shostname, self.ds.get_hostname()) diff -Nru cloud-init-0.7.5/debian/patches/series cloud-init-0.7.5/debian/patches/series --- cloud-init-0.7.5/debian/patches/series 2014-10-02 10:59:12.000000000 -0600 +++ cloud-init-0.7.5/debian/patches/series 2015-01-14 06:59:35.000000000 -0700 @@ -1,3 +1,4 @@ lp1316475-1303986-cloudsigma.patch lp-1353008-cloud-init-local-needs-run.conf lp-1336855-grub_xvda.patch +lp-1383794-gce-short_name.patch