diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_controller/keystone.pp b/deployment/puppet/openstack_tasks/manifests/openstack_controller/keystone.pp
index 8f6112182a..8ee4742730 100644
--- a/deployment/puppet/openstack_tasks/manifests/openstack_controller/keystone.pp
+++ b/deployment/puppet/openstack_tasks/manifests/openstack_controller/keystone.pp
@@ -40,6 +40,7 @@ class openstack_tasks::openstack_controller::keystone {
     password              => $password,
     auth_name             => $auth_name,
     configure_endpoint    => $configure_endpoint,
+    configure_endpoint_v3 => false,
     configure_user        => $configure_user,
     configure_user_role   => $configure_user_role,
     service_name          => $service_name,
diff --git a/tests/noop/spec/hosts/openstack-controller/keystone_spec.rb b/tests/noop/spec/hosts/openstack-controller/keystone_spec.rb
index 12e0a50d03..efcaeadbc2 100644
--- a/tests/noop/spec/hosts/openstack-controller/keystone_spec.rb
+++ b/tests/noop/spec/hosts/openstack-controller/keystone_spec.rb
@@ -47,10 +47,11 @@ describe manifest do
 
     it 'class nova::keystone::auth should  contain correct *_url' do
       should contain_class('nova::keystone::auth').with(
-        'public_url'       => "#{public_base_url}/v2.1",
-        'internal_url'     => "#{internal_base_url}/v2.1",
-        'admin_url'        => "#{admin_base_url}/v2.1",
-        'tenant'           => tenant,
+        'public_url'            => "#{public_base_url}/v2.1",
+        'internal_url'          => "#{internal_base_url}/v2.1",
+        'admin_url'             => "#{admin_base_url}/v2.1",
+        'tenant'                => tenant,
+        'configure_endpoint_v3' => false,
       )
     end