diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index 188e7be99..58da3b247 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -92,11 +92,10 @@ class { '::openstack_integration::glance':
 class { '::openstack_integration::neutron':
   notification_topics => $notification_topics,
 }
-include ::openstack_integration::nova_placement
+include ::openstack_integration::placement
 class { '::openstack_integration::nova':
-  libvirt_rbd                   => true,
-  notification_topics           => $notification_topics,
-  placement_database_connection => 'mysql+pymysql://nova_placement:nova@127.0.0.1/nova_placement?charset=utf8',
+  libvirt_rbd         => true,
+  notification_topics => $notification_topics,
 }
 class { '::openstack_integration::cinder':
   backend => 'rbd',
diff --git a/manifests/nova.pp b/manifests/nova.pp
index e3064a6f2..e44fc5cf7 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -22,20 +22,12 @@
 #   (optional) AMQP topic used for OpenStack notifications
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*placement_database_connection*]
-#   (optional) Connection url for the placement database.
-#   Defaults to undef.
-#
 class openstack_integration::nova (
   $libvirt_rbd         = false,
   $libvirt_virt_type   = 'qemu',
   $libvirt_cpu_mode    = 'none',
   $volume_encryption   = false,
   $notification_topics = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $placement_database_connection = $::os_service_default,
 ) {
 
   include ::openstack_integration::config
@@ -106,18 +98,17 @@ class openstack_integration::nova (
     debug => true,
   }
   class { '::nova':
-    default_transport_url         => $default_transport_url,
-    notification_transport_url    => $notification_transport_url,
-    database_connection           => 'mysql+pymysql://nova:nova@127.0.0.1/nova?charset=utf8',
-    api_database_connection       => 'mysql+pymysql://nova_api:nova@127.0.0.1/nova_api?charset=utf8',
-    placement_database_connection => $placement_database_connection,
-    rabbit_use_ssl                => $::openstack_integration::config::ssl,
-    amqp_sasl_mechanisms          => 'PLAIN',
-    use_ipv6                      => $::openstack_integration::config::ipv6,
-    glance_api_servers            => "${::openstack_integration::config::base_url}:9292",
-    notification_driver           => 'messagingv2',
-    notify_on_state_change        => 'vm_and_task_state',
-    notification_topics           => $notification_topics,
+    default_transport_url      => $default_transport_url,
+    notification_transport_url => $notification_transport_url,
+    database_connection        => 'mysql+pymysql://nova:nova@127.0.0.1/nova?charset=utf8',
+    api_database_connection    => 'mysql+pymysql://nova_api:nova@127.0.0.1/nova_api?charset=utf8',
+    rabbit_use_ssl             => $::openstack_integration::config::ssl,
+    amqp_sasl_mechanisms       => 'PLAIN',
+    use_ipv6                   => $::openstack_integration::config::ipv6,
+    glance_api_servers         => "${::openstack_integration::config::base_url}:9292",
+    notification_driver        => 'messagingv2',
+    notify_on_state_change     => 'vm_and_task_state',
+    notification_topics        => $notification_topics,
   }
   class { '::nova::api':
     api_bind_address           => $::openstack_integration::config::host,
diff --git a/manifests/nova_placement.pp b/manifests/nova_placement.pp
deleted file mode 100644
index e760375fa..000000000
--- a/manifests/nova_placement.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Configure the Nova Placement service
-#
-class openstack_integration::nova_placement {
-
-  include ::openstack_integration::config
-  include ::openstack_integration::params
-
-  class { '::nova::db::mysql_placement':
-    password => 'nova',
-  }
-
-  if ($::os_package_type == 'debian') {
-    class { '::nova::keystone::auth_placement':
-      public_url   => "${::openstack_integration::config::base_url}:8778",
-      internal_url => "${::openstack_integration::config::base_url}:8778",
-      admin_url    => "${::openstack_integration::config::base_url}:8778",
-      password     => 'a_big_secret',
-    }
-  } else {
-    class { '::nova::keystone::auth_placement':
-      public_url   => "${::openstack_integration::config::base_url}:8778/placement",
-      internal_url => "${::openstack_integration::config::base_url}:8778/placement",
-      admin_url    => "${::openstack_integration::config::base_url}:8778/placement",
-      password     => 'a_big_secret',
-    }
-  }
-
-  if ($::os_package_type != 'debian') {
-    class { '::nova::wsgi::apache_placement':
-      bind_host => $::openstack_integration::config::ip_for_url,
-      api_port  => '8778',
-      ssl_key   => "/etc/nova/ssl/private/${::fqdn}.pem",
-      ssl_cert  => $::openstack_integration::params::cert_path,
-      ssl       => $::openstack_integration::config::ssl,
-      workers   => '2',
-    }
-  }
-}