From 4e6d741889a251dae4431bc58b53f2f422d51e73 Mon Sep 17 00:00:00 2001 From: Nguyen Van Duc Date: Wed, 18 Jul 2018 15:15:14 +0700 Subject: [PATCH] Replace port 35357 with 5000 for "auth_url" Based on the change in Keystone Install Guide [1], this patch replace port 35357 with 5000 for "auth_url". For more details, please check similar changes which have been done on other projects: Nova [2], Neutron [3], Cinder [4], Glance [5]. [1] https://review.openstack.org/#/c/541857 [2] https://review.openstack.org/#/c/562812 [3] https://review.openstack.org/#/c/566491 [4] https://review.openstack.org/#/c/565464 [5] https://review.openstack.org/#/c/558932 Change-Id: Idaf125a35d36d82b6861930ccb6b9c1dc9231eaf --- manifests/auth_file.pp | 4 ++-- spec/classes/openstack_extras_auth_file_spec.rb | 4 ++-- spec/unit/puppet/provider/cib.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/auth_file.pp b/manifests/auth_file.pp index 14dfd5c..6650df9 100644 --- a/manifests/auth_file.pp +++ b/manifests/auth_file.pp @@ -22,7 +22,7 @@ # # [*service_endpoint*] # (optional) Keystone service endpoint -# Defaults to 'http://127.0.0.1:35357/v3/' +# Defaults to 'http://127.0.0.1:5000/v3/' # # [*username*] # (optional) Username for this account as defined in keystone @@ -122,7 +122,7 @@ class openstack_extras::auth_file( $password = undef, $auth_url = 'http://127.0.0.1:5000/v3/', $service_token = undef, - $service_endpoint = 'http://127.0.0.1:35357/v3/', + $service_endpoint = 'http://127.0.0.1:5000/v3/', $username = 'admin', $tenant_name = undef, $project_name = 'openstack', diff --git a/spec/classes/openstack_extras_auth_file_spec.rb b/spec/classes/openstack_extras_auth_file_spec.rb index 8a8d96f..5d070bb 100644 --- a/spec/classes/openstack_extras_auth_file_spec.rb +++ b/spec/classes/openstack_extras_auth_file_spec.rb @@ -38,7 +38,7 @@ describe 'openstack_extras::auth_file' do :password => 'admin', :auth_url => 'http://127.0.0.2:5000/v3/', :service_token => 'servicetoken', - :service_endpoint => 'http://127.0.0.2:35357/v3/', + :service_endpoint => 'http://127.0.0.2:5000/v3/', :username => 'myuser', :tenant_name => 'mytenant', :project_name => 'myproject', @@ -66,7 +66,7 @@ describe 'openstack_extras::auth_file' do it 'should create a openrc file' do verify_contents(catalogue, '/root/openrc', [ 'export OS_SERVICE_TOKEN=\'servicetoken\'', - 'export OS_SERVICE_ENDPOINT=\'http://127.0.0.2:35357/v3/\'', + 'export OS_SERVICE_ENDPOINT=\'http://127.0.0.2:5000/v3/\'', 'export OS_NO_CACHE=\'false\'', 'export OS_TENANT_NAME=\'mytenant\'', 'export OS_PROJECT_NAME=\'myproject\'', diff --git a/spec/unit/puppet/provider/cib.xml b/spec/unit/puppet/provider/cib.xml index 4fdbf3d..497c23a 100644 --- a/spec/unit/puppet/provider/cib.xml +++ b/spec/unit/puppet/provider/cib.xml @@ -136,7 +136,7 @@ - + @@ -180,7 +180,7 @@ - +