Merge remote-tracking branch 'upstream/devel' into devel

lib/ansible/utils/template.py

@@ -170,6 +170,8 @@ def _varFind(basedir, text, vars, lookup_fatal, depth=0):
             except errors.AnsibleError:
                 if not lookup_fatal:
                     replacement = None
+                else:
+                    raise
         else:
             replacement = None
         return {'replacement': replacement, 'start': start, 'end': end}

library/get_url

@@ -101,11 +101,13 @@ def url_do_get(module, url, dest):
     info = dict(url=url, dest=dest)
     r = None
     parsed = urlparse.urlparse(url)
-    if '@' in parsed.netloc:
-        credentials = parsed.netloc.split('@')[0]
+    if '@' in parsed[1]:
+        credentials, netloc = parsed[1].split('@', 1)
         if ':' in credentials:
-            username, password = credentials.split(':')
-        netloc = parsed.netloc.split('@')[1]
+            username, password = credentials.split(':', 1)
+        else:
+            username = credentials
+            password = ''
         parsed = list(parsed)
         parsed[1] = netloc
 

library/supervisorctl

@@ -58,7 +58,7 @@ def main():
 
     SUPERVISORCTL = module.get_bin_path('supervisorctl', True)
 
-    rc, out, err = module.run_command('%s status' % supervisorctl)
+    rc, out, err = module.run_command('%s status' % SUPERVISORCTL)
     present = name in out
 
     if state == 'present':
@@ -73,7 +73,7 @@ def main():
 
         module.exit_json(changed=False, name=name, state=state)
 
-    rc, out, err = module.run_command('%s status %s' % (supervisorctl, name))
+    rc, out, err = module.run_command('%s status %s' % (SUPERVISORCTL, name))
     running = 'RUNNING' in out
 
     if running and state == 'started':

plugins/inventory/ec2.py

@@ -274,7 +274,7 @@ class Ec2Inventory(object):
         addressable '''
 
         # Only want running instances
-        if instance.state == 'terminated':
+        if instance.state != 'running':
             return
 
         # Select the best destination address