1369 - Integrate ensure_dependencies.py

kick.py

 #!/usr/bin/env python
 # coding: utf-8
 
 import sys
 import getopt
 from run import resolveHostList, runCommand
 
 def usage():
   print >>sys.stderr, '''
 Usage: %s [-u <user>] [-t|-q] [<host>|<group>] ...
@@ skipping 31 matching lines @@
     elif option == '-t':
       mode = ' --test --noop'
 
   return user, mode, args
 
 def updateMaster(user):
   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)
 
 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__":
   user, mode, args = parseOptions(sys.argv[1:])
   needKicking = resolveHostList(args)
   if len(needKicking) == 0:
     print >>sys.stderr, 'No valid hosts or groups specified, nothing to do'
     sys.exit(0)
   updateMaster(user)
   for host in needKicking:
     updateClient(user, host, mode)