diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp
index a67ca6d0f..d4557125e 100644
--- a/manifests/ceilometer.pp
+++ b/manifests/ceilometer.pp
@@ -27,7 +27,6 @@ class openstack_integration::ceilometer {
 
   class { '::ceilometer':
     telemetry_secret => 'secrete',
-    metering_secret  => 'secrete',
     rabbit_userid    => 'ceilometer',
     rabbit_password  => 'an_even_bigger_secret',
     rabbit_host      => $::openstack_integration::config::ip_for_url,
diff --git a/manifests/heat.pp b/manifests/heat.pp
index 1222a4f29..0da0c9c3d 100644
--- a/manifests/heat.pp
+++ b/manifests/heat.pp
@@ -38,7 +38,7 @@ class openstack_integration::heat {
     rabbit_port         => $::openstack_integration::config::rabbit_port,
     database_connection => 'mysql+pymysql://heat:heat@127.0.0.1/heat?charset=utf8',
     identity_uri        => $::openstack_integration::config::keystone_auth_uri,
-    auth_uri            => $::openstack_integration::config::keystone_admin_uri,
+    auth_plugin         => 'password',
     keystone_password   => 'a_big_secret',
     debug               => true,
   }
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 70654a06f..e781ce72e 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -5,7 +5,7 @@ class openstack_integration::swift {
   # TODO(emilien): deploy memcached in IPv6
   include ::memcached
   class { '::swift':
-    swift_hash_suffix => 'secrete',
+    swift_hash_path_suffix => 'secrete',
   }
   class { '::swift::proxy':
     proxy_local_net_ip => $::openstack_integration::config::host,
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index ad699e3b9..6ce5e68a0 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -90,7 +90,7 @@ class openstack_integration::tempest (
     identity_uri           => "${::openstack_integration::config::keystone_auth_uri}/v2.0",
     identity_uri_v3        => "${::openstack_integration::config::keystone_auth_uri}/v3",
     admin_username         => 'admin',
-    admin_tenant_name      => 'openstack',
+    admin_project_name     => 'openstack',
     admin_password         => 'a_big_secret',
     admin_domain_name      => 'Default',
     auth_version           => 'v3',
diff --git a/manifests/trove.pp b/manifests/trove.pp
index 833d8f5b9..8ece7067d 100644
--- a/manifests/trove.pp
+++ b/manifests/trove.pp
@@ -61,13 +61,11 @@ class openstack_integration::trove {
   class { '::trove::client': }
   class { '::trove::conductor':
     debug    => true,
-    verbose  => true,
     workers  => 2,
     auth_url => $::openstack_integration::config::keystone_auth_uri,
   }
   class { '::trove::taskmanager':
     debug                   => true,
-    verbose                 => true,
     auth_url                => $::openstack_integration::config::keystone_auth_uri,
     use_guestagent_template => false,
   }