Replace port 35357 with 5000

Now that the v2.0 API has been removed, we don't have a reason to
include deployment instructions for two separate applications on
different ports.

Change-Id: Ia81c354ea593954e79a0779f222208c027fcdede
This commit is contained in:
ZhijunWei 2018-05-13 15:05:32 +08:00
parent b8bb27afc9
commit 016e2634c9
4 changed files with 8 additions and 8 deletions

View File

@ -57,7 +57,7 @@ class { '::heat':
rabbit_password => 'an_even_bigger_secret',
rabbit_host => '127.0.0.1',
database_connection => 'mysql+pymysql://heat:a_big_secret@127.0.0.1/heat?charset=utf8',
identity_uri => 'http://127.0.0.1:35357/',
identity_uri => 'http://127.0.0.1:5000/',
keystone_password => 'a_big_secret',
}

View File

@ -14,7 +14,7 @@
#
# [*auth_url*]
# (Optional) The URL to use for authentication.
# Defaults to 'http://127.0.0.1:35357/'
# Defaults to 'http://127.0.0.1:5000/'
#
# [*project_name*]
# (Optional) Service project name
@ -187,7 +187,7 @@
class heat::keystone::authtoken(
$password = $::os_service_default,
$username = 'heat',
$auth_url = 'http://127.0.0.1:35357/',
$auth_url = 'http://127.0.0.1:5000/',
$project_name = 'services',
$user_domain_name = 'Default',
$project_domain_name = 'Default',

View File

@ -126,7 +126,7 @@ describe 'heat' do
end
it 'configures auth_url' do
is_expected.to contain_heat_config('trustee/auth_url').with_value( 'http://127.0.0.1:35357/' )
is_expected.to contain_heat_config('trustee/auth_url').with_value( 'http://127.0.0.1:5000/' )
end
it 'configures username' do
@ -373,12 +373,12 @@ describe 'heat' do
shared_examples_for 'with ec2authtoken auth uri set' do
before do
params.merge!(
:keystone_ec2_uri => 'http://1.2.3.4:35357/v2.0/ec2tokens'
:keystone_ec2_uri => 'http://1.2.3.4:5000/v2.0/ec2tokens'
)
end
it do
is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value('http://1.2.3.4:35357/v2.0/ec2tokens')
is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value('http://1.2.3.4:5000/v2.0/ec2tokens')
end
end

View File

@ -13,7 +13,7 @@ describe 'heat::keystone::authtoken' do
it 'configure keystone_authtoken' do
is_expected.to contain_heat_config('keystone_authtoken/username').with_value('heat')
is_expected.to contain_heat_config('keystone_authtoken/password').with_value('heat_password')
is_expected.to contain_heat_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/')
is_expected.to contain_heat_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000/')
is_expected.to contain_heat_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_heat_config('keystone_authtoken/user_domain_name').with_value('Default')
is_expected.to contain_heat_config('keystone_authtoken/project_domain_name').with_value('Default')
@ -53,7 +53,7 @@ describe 'heat::keystone::authtoken' do
:www_authenticate_uri => 'https://10.0.0.1:9999/',
:username => 'myuser',
:password => 'mypasswd',
:auth_url => 'http://:127.0.0.1:35357',
:auth_url => 'http://:127.0.0.1:5000',
:project_name => 'service_project',
:user_domain_name => 'domainX',
:project_domain_name => 'domainX',