diff --git a/modules/devstack_host/files/rabbitmq-env.conf b/modules/devstack_host/files/rabbitmq-env.conf
deleted file mode 100644
index ce9f3c4689..0000000000
--- a/modules/devstack_host/files/rabbitmq-env.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is managed by puppet
-# Use localhost in the node name so that we don't need to
-# touch /etc/hosts or use dns
-NODENAME=rabbit@localhost
diff --git a/modules/devstack_host/manifests/init.pp b/modules/devstack_host/manifests/init.pp
deleted file mode 100644
index 5a96c10e6f..0000000000
--- a/modules/devstack_host/manifests/init.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-# == Class: devstack_host
-#
-# A machine ready to run devstack
-class devstack_host {
-  package { 'linux-headers-virtual':
-    ensure => present,
-  }
-
-  package { 'mysql-server':
-    ensure => present,
-  }
-
-  package { 'rabbitmq-server':
-    ensure  => present,
-    require => File['/etc/rabbitmq/rabbitmq-env.conf'],
-  }
-
-  file { '/etc/rabbitmq':
-    ensure => directory,
-  }
-
-  file { '/etc/rabbitmq/rabbitmq-env.conf':
-    ensure  => present,
-    group   => 'root',
-    mode    => '0444',
-    owner   => 'root',
-    require => File['/etc/rabbitmq'],
-    source  => 'puppet:///modules/devstack_host/rabbitmq-env.conf',
-  }
-
-  # TODO: We should be using existing mysql functions do this.
-  exec { 'Set MySQL server root password':
-    command     => 'mysqladmin -uroot password secret',
-    path        => '/bin:/usr/bin',
-    refreshonly => true,
-    subscribe   => Package['mysql-server'],
-    unless      => 'mysqladmin -uroot -psecret status',
-  }
-}
-
-# vim:sw=2:ts=2:expandtab:textwidth=79