Issue 2382 - Remove hard-coded Puppet-master reference in updateMaster()

kick.py

 #!/usr/bin/env python
 # coding: utf-8
 
 import sys
 import getopt
 from run import resolveHostList, runCommand, createArgumentParser
 
 def parseOptions(args):
   description = 'Run provisioning on the given hosts or groups of hosts'
   parser = createArgumentParser(description=description)
@@ skipping 19 matching lines @@
     sys.exit(1)
   elif options.quiet:
     options.mode = ''
   elif options.dry_run:
     options.mode = ' --test --noop'
   else:
     options.mode = ' --test'
 
   return options
 
-def updateMaster(user):
+def updateMaster(options):
   print 'Updating data on the puppet master...'
   remoteCommand = ' && '.join([
     'sudo hg pull -qu -R /etc/puppet/infrastructure',
     'sudo hg pull -qu -R /etc/puppet/infrastructure/modules/private',
     'sudo /etc/puppet/infrastructure/ensure_dependencies.py /etc/puppet/infrastructure',
   ])
-  runCommand(user, 'puppetmaster.adblockplus.org', remoteCommand)
+  runCommand(options.user, options.remote, remoteCommand)
 
 def updateClient(user, host, mode):
   print 'Provisioning %s...' % host
   remoteCommand = 'sudo puppet agent%s' % mode
 
   # Have to ignore errors here, Puppet will return non-zero for successful runs
   runCommand(user, host, remoteCommand, ignore_errors=True)
 
 if __name__ == '__main__':
   options = parseOptions(sys.argv[1:])
-  updateMaster(options.user)
+  updateMaster(options)
   needKicking = resolveHostList(options)
   if len(needKicking) == 0:
     print >>sys.stderr, 'No valid hosts or groups specified, nothing to do'
     sys.exit(0)
   for host in needKicking:
     updateClient(options.user, host, options.mode)