diff --git a/manifests/site.pp b/manifests/site.pp
index d5bfba9f7d..18190407eb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -235,6 +235,11 @@ node /^ci-backup-.*\.openstack\.org$/ {
 # Jenkins slaves:
 #
 
+node 'devstack-launch.slave.openstack.org' {
+  class { 'openstack_project::devstack_launch_slave':
+  }
+}
+
 node 'tx.slave.openstack.org' {
   class { 'openstack_project::translation_slave':
     transifex_username => 'openstackjenkins',
diff --git a/modules/openstack_project/manifests/devstack_launch_slave.pp b/modules/openstack_project/manifests/devstack_launch_slave.pp
new file mode 100644
index 0000000000..c56404ac10
--- /dev/null
+++ b/modules/openstack_project/manifests/devstack_launch_slave.pp
@@ -0,0 +1,15 @@
+# == Class: openstack_project::devstack_launch_slave
+#
+class openstack_project::devstack_launch_slave (
+) {
+
+  class { 'openstack_project::slave':
+    bare => true,
+  }
+
+  package { ['python-novaclient', 'statsd', 'paramiko']:
+    ensure   => latest,
+    provider => pip,
+    require  => Class['pip'],
+  }
+}
diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp
index 022c54c5c2..8dd70fd4b4 100644
--- a/modules/openstack_project/manifests/slave.pp
+++ b/modules/openstack_project/manifests/slave.pp
@@ -1,6 +1,7 @@
 # == Class: openstack_project::slave
 #
 class openstack_project::slave (
+  $bare = false,
   $certname = $::fqdn,
   $sysadmins = []
 ) {
@@ -13,6 +14,7 @@ class openstack_project::slave (
     sysadmins                 => $sysadmins,
   }
   class { 'jenkins::slave':
+    bare    => $bare,
     ssh_key => $openstack_project::jenkins_ssh_key,
   }
   class { 'salt':