Merge pull request #7667 from alexclear/devel

ansible-pull should respect inventory file settings because, say, Python...
ansible · Jun 5, 2014 · 11b72df · 11b72df
2 parents 7483acd + bb1941a
commit 11b72df
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/bin/ansible-pull b/bin/ansible-pull
@@ -150,7 +150,10 @@ def main(args):
     now = datetime.datetime.now()
     print >>sys.stderr, now.strftime("Starting ansible-pull at %F %T")
 
-    inv_opts = 'localhost,'
+    if not options.inventory:
+        inv_opts = 'localhost,'
+    else:
+        inv_opts = options.inventory
     limit_opts = 'localhost:%s:127.0.0.1' % hostname
     repo_opts = "name=%s dest=%s" % (options.url, options.dest)