From ef17fc9f2089048042494514fdfc15f608c3f79d Mon Sep 17 00:00:00 2001
From: Rob Parrott <robparrott@gmail.com>
Date: Sat, 16 Feb 2013 20:27:38 -0500
Subject: [PATCH] add the ability to take variables in the add_host module, and
 be willing to parse a host:port hostname handed to add_host

---
 lib/ansible/runner/action_plugins/add_host.py | 15 ++++++++++++++-
 library/add_host                              |  7 +++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/ansible/runner/action_plugins/add_host.py b/lib/ansible/runner/action_plugins/add_host.py
index 48f327b1351..9727b8d0f16 100644
--- a/lib/ansible/runner/action_plugins/add_host.py
+++ b/lib/ansible/runner/action_plugins/add_host.py
@@ -48,9 +48,22 @@ class ActionModule(object):
 
         result = {'changed': True}
 
-        new_host = Host(args['hostname'])
+        # Parse out any hostname:port patterns
+        new_hostname = args['hostname']
+        if ":" in new_hostname:
+            new_hostname, new_port = new_hostname.split(":")
+            args['ansible_ssh_port'] = new_port
+        
+        # create host and get inventory    
+        new_host = Host(new_hostname)
         inventory = self.runner.inventory
         
+        # Add any variables to the new_host
+        for k in args.keys():
+            if k != 'hostname' and k != 'groupname':
+                new_host.set_variable(k, args[k]) 
+                
+        
         # add the new host to the 'all' group
         allgroup = inventory.get_group('all')
         allgroup.add_host(new_host)
diff --git a/library/add_host b/library/add_host
index fe9780e9219..20d38252959 100644
--- a/library/add_host
+++ b/library/add_host
@@ -5,13 +5,14 @@ DOCUMENTATION = '''
 module: add_host
 short_description: add a host (and alternatively a group) to the ansible-playbook in-memory inventory
 description:
-  - Use variables to create new hosts and groups in inventory for use in later plays of the same playbook
+  - Use variables to create new hosts and groups in inventory for use in later plays of the same playbook. 
+    Takes variables so you can define the new hosts more fully.
 version_added: 0.9
 options:
   hostname:
     description:
     - The hostname/ip of the host to add to the inventory
-    required: true
+    required: true     
   groupname:
     description:
     - The groupname to add the hostname to.
@@ -20,4 +21,6 @@ author: Seth Vidal
 examples:
   - description: add host to group 'just_created'
     code: add_host hostname=${ip_from_ec2create} groupname=just_created
+  - description add a host with a non-standard port local to your machines
+    code: add_host hostname='${new_ip}:${new_port}' ansible_ssh_port='${new_port}' ansible_ssh_host='${new_ip}' groupname=cloud_hosts
 '''
\ No newline at end of file