Added new configuration option for OpenStackVmInstance for cloud-init

[snaps.git] / snaps / playbook_runner.py

diff --git a/snaps/playbook_runner.py b/snaps/playbook_runner.py
index 3710309..87321f5 100644 (file)
--- a/snaps/playbook_runner.py
+++ b/snaps/playbook_runner.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs")
+# Copyright (c) 2017 Cable Television Laboratories, Inc. ("CableLabs")
 #                    and others.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import argparse
+import ast
 import logging
 
 import re
@@ -27,7 +28,8 @@ logger = logging.getLogger('playbook_runner')
 
 def main(parsed_args):
     """
-    Uses ansible_utils for applying Ansible Playbooks to machines with a private key
+    Uses ansible_utils for applying Ansible Playbooks to machines with a
+    private key
     """
     logging.basicConfig(level=logging.DEBUG)
     logger.info('Starting Playbook Runner')
@@ -35,24 +37,45 @@ def main(parsed_args):
     proxy_settings = None
     if parsed_args.http_proxy:
         tokens = re.split(':', parsed_args.http_proxy)
-        proxy_settings = ProxySettings(tokens[0], tokens[1], parsed_args.ssh_proxy_cmd)
+        proxy_settings = ProxySettings(host=tokens[0], port=tokens[1],
+                                       ssh_proxy_cmd=parsed_args.ssh_proxy_cmd)
 
     # Ensure can get an SSH client
-    ansible_utils.ssh_client(parsed_args.ip_addr, parsed_args.host_user, parsed_args.priv_key, proxy_settings)
+    ssh = ansible_utils.ssh_client(parsed_args.ip_addr, parsed_args.host_user,
+                                   parsed_args.priv_key, proxy_settings)
+    if ssh:
+        ssh.close()
 
-    retval = ansible_utils.apply_playbook(parsed_args.playbook, [parsed_args.ip_addr], parsed_args.host_user,
-                                          parsed_args.priv_key, variables={'name': 'Foo'}, proxy_setting=proxy_settings)
+    vars = dict()
+    if args.vars:
+        vars = ast.literal_eval(args.vars)
+        if not isinstance(vars, dict):
+            vars = dict()
+
+    retval = ansible_utils.apply_playbook(
+        parsed_args.playbook, [parsed_args.ip_addr], parsed_args.host_user,
+        parsed_args.priv_key, variables=vars,
+        proxy_setting=proxy_settings)
     exit(retval)
 
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument('-a', '--ip-addr', dest='ip_addr', required=True, help='The Host IP Address')
-    parser.add_argument('-k', '--priv-key', dest='priv_key', required=True, help='The location of the private key file')
-    parser.add_argument('-u', '--host-user', dest='host_user', required=True, help='Host user account')
-    parser.add_argument('-b', '--playbook', dest='playbook', required=True, help='Playbook Location')
-    parser.add_argument('-p', '--http-proxy', dest='http_proxy', required=False, help='<host>:<port>')
-    parser.add_argument('-s', '--ssh-proxy-cmd', dest='ssh_proxy_cmd', required=False)
+    parser.add_argument('-a', '--ip-addr', dest='ip_addr', required=True,
+                        help='The Host IP Address')
+    parser.add_argument('-k', '--priv-key', dest='priv_key', required=True,
+                        help='The location of the private key file')
+    parser.add_argument('-u', '--host-user', dest='host_user', required=True,
+                        help='Host user account')
+    parser.add_argument('-b', '--playbook', dest='playbook', required=True,
+                        help='Playbook Location')
+    parser.add_argument('-p', '--http-proxy', dest='http_proxy',
+                        required=False, help='<host>:<port>')
+    parser.add_argument('-s', '--ssh-proxy-cmd', dest='ssh_proxy_cmd',
+                        required=False)
+    parser.add_argument('-v', '--vars', dest='vars',
+                        required=False)
     args = parser.parse_args()
 
     main(args)
+