Merge ~d-info-e/cloud-init:fix-typos into cloud-init:master

Proposed by do3meli
Status: Merged
Approved by: Scott Moser
Approved revision: 76fda6b399e0a1adcd1e7acebaad259bb223ab77
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~d-info-e/cloud-init:fix-typos
Merge into: cloud-init:master
Diff against target: 61 lines (+6/-6)
3 files modified
cloudinit/stages.py (+1/-1)
cloudinit/templater.py (+2/-2)
cloudinit/url_helper.py (+3/-3)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
cloud-init Commiters Pending
Review via email: mp+374205@code.launchpad.net

Commit message

Small typo fixes in code comments.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index 5012988..77c21de 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -501,7 +501,7 @@ class Init(object):
501 # Init the handlers first501 # Init the handlers first
502 for (_ctype, mod) in c_handlers.items():502 for (_ctype, mod) in c_handlers.items():
503 if mod in c_handlers.initialized:503 if mod in c_handlers.initialized:
504 # Avoid initing the same module twice (if said module504 # Avoid initiating the same module twice (if said module
505 # is registered to more than one content-type).505 # is registered to more than one content-type).
506 continue506 continue
507 handlers.call_begin(mod, data, frequency)507 handlers.call_begin(mod, data, frequency)
diff --git a/cloudinit/templater.py b/cloudinit/templater.py
index b668674..e47cded 100644
--- a/cloudinit/templater.py
+++ b/cloudinit/templater.py
@@ -44,7 +44,7 @@ MISSING_JINJA_PREFIX = u'CI_MISSING_JINJA_VAR/'
4444
45@implements_to_string # Needed for python2.7. Otherwise cached super.__str__45@implements_to_string # Needed for python2.7. Otherwise cached super.__str__
46class UndefinedJinjaVariable(JUndefined):46class UndefinedJinjaVariable(JUndefined):
47 """Class used to represent any undefined jinja template varible."""47 """Class used to represent any undefined jinja template variable."""
4848
49 def __str__(self):49 def __str__(self):
50 return u'%s%s' % (MISSING_JINJA_PREFIX, self._undefined_name)50 return u'%s%s' % (MISSING_JINJA_PREFIX, self._undefined_name)
@@ -58,7 +58,7 @@ class UndefinedJinjaVariable(JUndefined):
5858
5959
60def basic_render(content, params):60def basic_render(content, params):
61 """This does sumple replacement of bash variable like templates.61 """This does simple replacement of bash variable like templates.
6262
63 It identifies patterns like ${a} or $a and can also identify patterns like63 It identifies patterns like ${a} or $a and can also identify patterns like
64 ${a.b} or $a.b which will look for a key 'b' in the dictionary rooted64 ${a.b} or $a.b which will look for a key 'b' in the dictionary rooted
diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py
index 44ee61d..0f4c36f 100644
--- a/cloudinit/url_helper.py
+++ b/cloudinit/url_helper.py
@@ -326,10 +326,10 @@ def wait_for_url(urls, max_wait=None, timeout=None,
326 sleep_time_cb: call method with 2 arguments (response, loop_n) that326 sleep_time_cb: call method with 2 arguments (response, loop_n) that
327 generates the next sleep time.327 generates the next sleep time.
328328
329 the idea of this routine is to wait for the EC2 metdata service to329 the idea of this routine is to wait for the EC2 metadata service to
330 come up. On both Eucalyptus and EC2 we have seen the case where330 come up. On both Eucalyptus and EC2 we have seen the case where
331 the instance hit the MD before the MD service was up. EC2 seems331 the instance hit the MD before the MD service was up. EC2 seems
332 to have permenantely fixed this, though.332 to have permanently fixed this, though.
333333
334 In openstack, the metadata service might be painfully slow, and334 In openstack, the metadata service might be painfully slow, and
335 unable to avoid hitting a timeout of even up to 10 seconds or more335 unable to avoid hitting a timeout of even up to 10 seconds or more
@@ -338,7 +338,7 @@ def wait_for_url(urls, max_wait=None, timeout=None,
338 Offset those needs with the need to not hang forever (and block boot)338 Offset those needs with the need to not hang forever (and block boot)
339 on a system where cloud-init is configured to look for EC2 Metadata339 on a system where cloud-init is configured to look for EC2 Metadata
340 service but is not going to find one. It is possible that the instance340 service but is not going to find one. It is possible that the instance
341 data host (169.254.169.254) may be firewalled off Entirely for a sytem,341 data host (169.254.169.254) may be firewalled off Entirely for a system,
342 meaning that the connection will block forever unless a timeout is set.342 meaning that the connection will block forever unless a timeout is set.
343343
344 A value of None for max_wait will retry indefinitely.344 A value of None for max_wait will retry indefinitely.

Subscribers

People subscribed via source and target branches