[placement] Replace port 35357 with 5000 for "auth_url"
This is a partial backport limited for the placement service only.
Change-Id: Ieb2e00396d42fc1389af6f562d26ec85067203c9
(cherry picked from commit efe3daa2b6
)
This commit is contained in:
parent
1bacc4827f
commit
66fff82237
|
@ -52,7 +52,7 @@
|
|||
# (optional) Authorization URL for connection to nova in admin context.
|
||||
# If version independent identity plugin is used available versions will be
|
||||
# determined using auth_url
|
||||
# Defaults to 'http://127.0.0.1:35357'
|
||||
# Defaults to 'http://127.0.0.1:5000'
|
||||
#
|
||||
# [*region_name*]
|
||||
# (optional) Name of nova region to use. Useful if keystone manages more than
|
||||
|
@ -74,7 +74,7 @@ class neutron::server::placement (
|
|||
$project_name = 'services',
|
||||
$user_domain_id = 'default',
|
||||
$user_domain_name = 'Default',
|
||||
$auth_url = 'http://127.0.0.1:35357',
|
||||
$auth_url = 'http://127.0.0.1:5000',
|
||||
$region_name = $::os_service_default,
|
||||
$endpoint_type = $::os_service_default,
|
||||
) {
|
||||
|
|
|
@ -27,7 +27,7 @@ describe 'neutron::server::placement' do
|
|||
:project_name => 'services',
|
||||
:user_domain_id => 'default',
|
||||
:user_domain_name => 'Default',
|
||||
:auth_url => 'http://127.0.0.1:35357',
|
||||
:auth_url => 'http://127.0.0.1:5000',
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -41,7 +41,7 @@ describe 'neutron::server::placement' do
|
|||
|
||||
it 'configure neutron.conf' do
|
||||
is_expected.to contain_neutron_config('placement/auth_type').with_value('password')
|
||||
is_expected.to contain_neutron_config('placement/auth_url').with_value('http://127.0.0.1:35357')
|
||||
is_expected.to contain_neutron_config('placement/auth_url').with_value('http://127.0.0.1:5000')
|
||||
is_expected.to contain_neutron_config('placement/username').with_value('nova')
|
||||
is_expected.to contain_neutron_config('placement/password').with_value('secrete')
|
||||
is_expected.to contain_neutron_config('placement/password').with_secret( true )
|
||||
|
@ -56,7 +56,7 @@ describe 'neutron::server::placement' do
|
|||
context 'when overriding parameters' do
|
||||
before :each do
|
||||
params.merge!(
|
||||
:auth_url => 'http://keystone:35357/v2.0',
|
||||
:auth_url => 'http://keystone:5000/v2.0',
|
||||
:auth_type => 'v2password',
|
||||
:username => 'joe',
|
||||
:region_name => 'MyRegion',
|
||||
|
@ -68,7 +68,7 @@ describe 'neutron::server::placement' do
|
|||
)
|
||||
end
|
||||
it 'should configure neutron server with overrided parameters' do
|
||||
is_expected.to contain_neutron_config('placement/auth_url').with_value('http://keystone:35357/v2.0')
|
||||
is_expected.to contain_neutron_config('placement/auth_url').with_value('http://keystone:5000/v2.0')
|
||||
is_expected.to contain_neutron_config('placement/auth_type').with_value('v2password')
|
||||
is_expected.to contain_neutron_config('placement/username').with_value('joe')
|
||||
is_expected.to contain_neutron_config('placement/password').with_value('secrete')
|
||||
|
|
Loading…
Reference in New Issue