cloud-init

Merge lp:~agrimm/cloud-init/trunk-lp1050962 into lp:~cloud-init-dev/cloud-init/trunk

  1. trunk-lp1050962
  2. Merge into trunk
Proposed by Andy Grimm
Status: Merged
Merged at revision: 648
Proposed branch: lp:~agrimm/cloud-init/trunk-lp1050962
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 11 lines (+1/-1)
1 file modified
cloudinit/sources/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~agrimm/cloud-init/trunk-lp1050962
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+124456@code.launchpad.net

Description of the change

Fixes 1050962

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'cloudinit/sources/__init__.py'
--- cloudinit/sources/__init__.py 2012-08-28 03:51:00 +0000
+++ cloudinit/sources/__init__.py 2012-09-14 15:54:20 +0000
@@ -173,7 +173,7 @@
173 # make up a hostname (LP: #475354) in format ip-xx.xx.xx.xx173 # make up a hostname (LP: #475354) in format ip-xx.xx.xx.xx
174 lhost = self.metadata['local-hostname']174 lhost = self.metadata['local-hostname']
175 if util.is_ipv4(lhost):175 if util.is_ipv4(lhost):
176 toks = "ip-%s" % lhost.replace(".", "-")176 toks = [ "ip-%s" % lhost.replace(".", "-") ]
177 else:177 else:
178 toks = lhost.split(".")178 toks = lhost.split(".")
179179