Merge "Break dependency on jenkins::slave"

modules/openstack_project/manifests/single_use_slave.pp

@@ -40,12 +40,39 @@
       ],
     iptables_public_tcp_ports => [19885],
   }
-  class { 'jenkins::slave':
-    ssh_key         => $ssh_key,
-    gitfullname     => $jenkins_gitfullname,
-    gitemail        => $jenkins_gitemail,
+
+  include ::haveged
+  include ::pip
+
+  class { '::jenkins::jenkinsuser':
+    ssh_key     => $ssh_key,
+    gitfullname => $jenkins_gitfullname,
+    gitemail    => $jenkins_gitemail,
   }
 
+  # NOTE(pabelanger): We need to create this directory here, since slave.pp also
+  # creates it.  Moving forward, this will be moved into DIB.
+  file { '/usr/local/jenkins':
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0755',
+  }
+
+  package { 'tox':
+    ensure   => 'latest',
+    provider => openstack_pip,
+    require  => Class[pip],
+  }
+
+  # TODO(fungi): switch jobs to use /usr/git-review-env/bin/git-review
+  package { 'git-review':
+    ensure   => '1.25.0',
+    provider => openstack_pip,
+    require  => Class[pip],
+  }
+
+
   class { 'openstack_project::slave_common':
     sudo                => $sudo,
     project_config_repo => $project_config_repo,

modules/openstack_project/manifests/slave_common.pp

@@ -49,7 +49,7 @@
     group   => 'jenkins',
     mode    => '0644',
     source  => 'puppet:///modules/openstack_project/pydistutils.cfg',
-    require => Class['jenkins::slave'],
+    require => Class['jenkins::jenkinsuser'],
   }
 
   if ($sudo == true) {