diff --git a/manifests/manila.pp b/manifests/manila.pp
index da718db8c..74299796e 100644
--- a/manifests/manila.pp
+++ b/manifests/manila.pp
@@ -36,14 +36,12 @@ class openstack_integration::manila (
     host     => $openstack_integration::config::host,
   }
   class { 'manila::keystone::auth':
-    public_url      => "${openstack_integration::config::base_url}:8786/v1/%(tenant_id)s",
-    internal_url    => "${openstack_integration::config::base_url}:8786/v1/%(tenant_id)s",
-    admin_url       => "${openstack_integration::config::base_url}:8786/v1/%(tenant_id)s",
-    public_url_v2   => "${openstack_integration::config::base_url}:8786/v2",
-    internal_url_v2 => "${openstack_integration::config::base_url}:8786/v2",
-    admin_url_v2    => "${openstack_integration::config::base_url}:8786/v2",
-    roles           => ['admin', 'service'],
-    password        => 'a_big_secret',
+    configure_endpoint => false,
+    public_url_v2      => "${openstack_integration::config::base_url}:8786/v2",
+    internal_url_v2    => "${openstack_integration::config::base_url}:8786/v2",
+    admin_url_v2       => "${openstack_integration::config::base_url}:8786/v2",
+    roles              => ['admin', 'service'],
+    password           => 'a_big_secret',
   }
   class { 'manila::logging':
     debug => true,
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index a3a2e629c..e628152d2 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -367,6 +367,7 @@ class openstack_integration::tempest (
     baremetal_driver                  => 'fake-hardware',
     baremetal_enabled_hardware_types  => ['ipmi', 'fake-hardware'],
     load_balancer_test_with_noop      => true,
+    share_catalog_type                => 'sharev2',
     share_multitenancy_enabled        => false,
     share_enable_protocols            => [downcase($share_protocol)],
     share_capability_storage_protocol => $share_protocol,