Broke launchpad user sync into its own class.

Additionally, the file installation of the scripts wasn't working,
so the sync script wasn't actually getting installed. This moves
the underlying scripts to be installed by the gerrit module,
because it owns /usr/local/gerrit/scripts, and then manages the
gerrit hooks which call those scripts in the openstack_project
class, since that's where the config choice to enable those
functions really should live.

Change-Id: I54fb9edd9fb0c634d8d9de4e57f9ddad6af63a99

modules/launchpad_sync/files/update_gerrit_users.py

@@ -56,6 +56,7 @@ parser = argparse.ArgumentParser()
 parser.add_argument('user', help='The gerrit admin user')
 parser.add_argument('ssh_key', help='The gerrit admin SSH key file')
 parser.add_argument('site', help='The site in use (typically openstack or stackforge)')
+parser.add_argument('root_team', help='The root launchpad team to pull from')
 options = parser.parse_args()
 
 GERRIT_USER = options.user
@@ -126,7 +127,7 @@ def get_sub_teams(team, have_teams):
     return have_teams
 
 
-teams_todo = get_sub_teams('openstack', [])
+teams_todo = get_sub_teams(options.root_team, [])
 
 users={}
 groups={}

modules/launchpad_sync/manifests/init.pp

@@ -0,0 +1,24 @@
+class launchpad_sync(
+  $user,
+  $script_user,
+  $script_key_file,
+  $site,
+  $root_team
+) {
+
+  file { '/usr/local/bin/update_gerrit_users.py':
+    owner => 'root',
+    group => 'root',
+    mode => 755,
+    source => "puppet:///modules/launchpad_sync/update_gerrit_users.py",
+    ensure => present,
+  }
+
+  cron { "sync_launchpad_users":
+    user => $user,
+    minute => "*/15",
+    command => "sleep $((RANDOM\\%60+60)) && python /usr/local/bin/update_gerrit_users.py ${script_user} ${script_key_file} ${site} ${root_team}",
+    require => File['/usr/local/bin/update_gerrit_users.py'],
+  }
+
+}

modules/openstack_project/manifests/gerrit.pp

@@ -134,10 +134,15 @@ class openstack_project::gerrit (
   }
 
   cron { "gerritsyncusers":
-    user => gerrit2,
-    minute => "*/15",
-    command => "sleep $((RANDOM\\%60+60)) && python /usr/local/gerrit/scripts/update_gerrit_users.py ${script_user} ${script_key_file} openstack",
-    require => Class['::gerrit'],
+    ensure => absent,
+  }
+
+  class { "launchpad_sync":
+    user => "gerrit2",
+    script_user => $script_user,
+    script_key_file => $script_key_file,
+    site => "openstack",
+    root_team => "openstack",
   }
 
   file { '/home/gerrit2/review_site/hooks/change-merged':
@@ -145,7 +150,7 @@ class openstack_project::gerrit (
     group => 'root',
     mode => 555,
     ensure => 'present',
-    source => 'puppet:///modules/gerrit/change-merged',
+    source => 'puppet:///modules/openstack_project/gerrit/change-merged',
     replace => 'true',
     require => Class['::gerrit']
   }
@@ -155,7 +160,7 @@ class openstack_project::gerrit (
     group => 'root',
     mode => 555,
     ensure => 'present',
-    source => 'puppet:///modules/gerrit/patchset-created',
+    source => 'puppet:///modules/openstack_project/gerrit/patchset-created',
     replace => 'true',
     require => Class['::gerrit']
   }