Issue 2200 - PART II/II - Introduce --local and --remote parameters in {run,kick}.py

run.py

 #!/usr/bin/env python
 # coding: utf-8
 
 import argparse
 import sys
 import os
+import posixpath
 import re
 import subprocess
 import yaml
 
 def createArgumentParser(**kwargs):
   parser = argparse.ArgumentParser(**kwargs)
   parser.add_argument(
-    '-u', '--user', metavar='user', dest='user', type=str, default='vagrant',

[mathias, 2015/04/08 15:29:58]

Also removed this default, it's senseless until the next patch set (wich will be
in the context of another ticket), at least. And even then it should just apply
with --local and using ssh(1) instead of vagrant(1) - which is very much
unlikely.

+    '-u', '--user', metavar='user', dest='user', type=str,
     help='user name for use with SSH, must exist on all hosts'
   )
 
   parser.add_argument(
     '-l', '--local', action='store_false', dest='remote', default=None,
     help='use the local version of hosts.yaml'
   )
 
   parser.add_argument(
     '-r', '--remote', metavar='master', dest='remote', type=str,
@@ skipping 24 matching lines @@
 
   options = parser.parse_args(args)
   options.hosts = hosts
   return options
 
 def getValidHosts(options):
   path_canonical = ('modules', 'private', 'hiera', 'hosts.yaml')
 
   if options.remote:
     login = ['-l', options.user] if options.user else []
-    path_name = '/etc/puppet/infrastructure/%s' % ("/".join(path_canonical),)

[Wladimir Palant, 2015/04/08 14:59:35]

Please join paths properly:

import posixpath
path_name = posixpath.join('/etc/puppet/infrastructure', *path_canonical)

Using posixpath here because it should work independently of whatever OS this
script is running on.

[mathias, 2015/04/08 15:29:58]

Done.

+    path_name = posixpath.join('/etc/puppet/infrastructure', *path_canonical)
     command = ['ssh'] + login + [options.remote, '--', 'sudo', 'cat', path_name]
     child = subprocess.Popen(command, stderr=sys.stderr, stdout=subprocess.PIPE)
-    config = yaml.load(child.stdout)
-    child.stdout.close()
-    child.wait()

[Wladimir Palant, 2015/04/08 14:59:35]

Put yaml.load() into a try block and the two statements above into finally?

[mathias, 2015/04/08 15:29:58]

Done.

+    try:
+      config = yaml.load(child.stdout)
+    finally:
+      child.stdout.close()
+      child.wait()
   elif options.remote is False:
     dirname = os.path.dirname(sys.argv[0])
     path_name = os.path.join(dirname, *path_canonical)
     with open(path_name, 'rb') as handle:
       config = yaml.load(handle)
   else:
-    print >>sys.stderr, 'Please either specify a --remote host or use --local'
-    sys.exit(1)

[Wladimir Palant, 2015/04/08 14:59:35]

The two lines above are equivalent to:

sys.exit('Please either specify a --remote host or use --local')

[mathias, 2015/04/08 15:29:58]

Done.

+    sys.exit('Please either specify a --remote host or use --local')
 
   servers = config.get('servers', {})
   return servers  
 
 def resolveHostList(options):
 
   result = set()
 
   try:
     valid_hosts = getValidHosts(options)
@@ skipping 29 matching lines @@
 
 if __name__ == '__main__':
   options = parseOptions(sys.argv[1:])
   selectedHosts = resolveHostList(options)
   if len(selectedHosts) == 0:
     print >>sys.stderr, 'No valid hosts or groups specified, nothing to do'
     sys.exit(0)
   for host in selectedHosts:
     print >>sys.stderr, 'Running on %s...' % host
     runCommand(options.user, host, options.args, options.ignore_errors)