diff --git a/manifests/plugins/plumgrid.pp b/manifests/plugins/plumgrid.pp
index df24aaceb..a0d68ba2a 100644
--- a/manifests/plugins/plumgrid.pp
+++ b/manifests/plugins/plumgrid.pp
@@ -24,7 +24,7 @@
 #
 # [*connection*]
 #   Database connection
-#   Defaults to http://127.0.0.1:35357/v2.0
+#   Defaults to http://127.0.0.1:5000/v2.0
 #
 # [*admin_password*]
 #   Keystone admin password
@@ -101,7 +101,7 @@ class neutron::plugins::plumgrid (
   $username                     = $::os_service_default,
   $password                     = $::os_service_default,
   $servertimeout                = '99',
-  $connection                   = 'http://127.0.0.1:35357/v2.0',
+  $connection                   = 'http://127.0.0.1:5000/v2.0',
   $admin_password               = $::os_service_default,
   $controller_priv_host         = '127.0.0.1',
   $auth_protocol                = 'http',
@@ -181,7 +181,7 @@ class neutron::plugins::plumgrid (
   neutron_plumlib_plumgrid {
     'keystone_authtoken/admin_user' :                value => 'admin';
     'keystone_authtoken/admin_password':             value => $admin_password, secret =>true;
-    'keystone_authtoken/auth_uri':                   value => "${auth_protocol}://${controller_priv_host}:35357/${identity_version}";
+    'keystone_authtoken/auth_uri':                   value => "${auth_protocol}://${controller_priv_host}:5000/${identity_version}";
     'keystone_authtoken/admin_tenant_name':          value => 'admin';
     'keystone_authtoken/identity_version':           value => $identity_version;
     'keystone_authtoken/user_domain_name':           value => $user_domain_name;
diff --git a/spec/classes/neutron_plugins_plumgrid_spec.rb b/spec/classes/neutron_plugins_plumgrid_spec.rb
index 7a298269a..06c7cfc41 100644
--- a/spec/classes/neutron_plugins_plumgrid_spec.rb
+++ b/spec/classes/neutron_plugins_plumgrid_spec.rb
@@ -15,7 +15,7 @@ describe 'neutron::plugins::plumgrid' do
     :director_server      => '127.0.0.1',
     :director_server_port => '443',
     :servertimeout        => '99',
-    :connection           => 'http://127.0.0.1:35357/v2.0',
+    :connection           => 'http://127.0.0.1:5000/v2.0',
     :controller_priv_host => '127.0.0.1',
     :auth_protocol        => 'http',
     :identity_version     => 'v3',
@@ -82,7 +82,7 @@ describe 'neutron::plugins::plumgrid' do
     end
 
     it 'should perform default configuration of plumgrid plumlib' do
-      auth_uri = params[:auth_protocol] + "://" + params[:controller_priv_host] + ":" + "35357/" + params[:identity_version];
+      auth_uri = params[:auth_protocol] + "://" + params[:controller_priv_host] + ":" + "5000/" + params[:identity_version];
       is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/auth_uri').with_value(auth_uri)
       is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/identity_version').with_value(params[:identity_version])
       is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name])
diff --git a/spec/unit/provider/neutron_security_group/openstack_spec.rb b/spec/unit/provider/neutron_security_group/openstack_spec.rb
index 570de5df7..9313e27a0 100644
--- a/spec/unit/provider/neutron_security_group/openstack_spec.rb
+++ b/spec/unit/provider/neutron_security_group/openstack_spec.rb
@@ -10,7 +10,7 @@ describe provider_class do
     ENV['OS_USERNAME']     = 'admin'
     ENV['OS_PASSWORD']     = 'password'
     ENV['OS_PROJECT_NAME'] = 'admin_tenant'
-    ENV['OS_AUTH_URL']     = 'https://192.168.56.210:35357/v2.0/'
+    ENV['OS_AUTH_URL']     = 'https://192.168.56.210:5000/v2.0/'
   end
 
   before(:each) do
diff --git a/spec/unit/provider/neutron_spec.rb b/spec/unit/provider/neutron_spec.rb
index 514b22d19..2fee44a5b 100644
--- a/spec/unit/provider/neutron_spec.rb
+++ b/spec/unit/provider/neutron_spec.rb
@@ -14,7 +14,7 @@ describe Puppet::Provider::Neutron do
       'project_name'         => 'admin_tenant',
       'username'             => 'admin',
       'password'             => 'password',
-      'www_authenticate_uri' => 'https://192.168.56.210:35357/v2.0/',
+      'www_authenticate_uri' => 'https://192.168.56.210:5000/v2.0/',
       'project_domain_name'  => 'Default',
       'user_domain_name'     => 'Default',
     }