Merge "Change clients_keystone/auth_uri default to public Keystone URL"
This commit is contained in:
commit
60e8ae8909
|
@ -470,6 +470,7 @@ instead.")
|
|||
password => $amqp_password,
|
||||
}
|
||||
|
||||
$auth_uri = $::heat::keystone::authtoken::www_authenticate_uri
|
||||
$auth_url = $::heat::keystone::authtoken::auth_url
|
||||
$keystone_username = $::heat::keystone::authtoken::username
|
||||
$keystone_password = $::heat::keystone::authtoken::password
|
||||
|
@ -478,7 +479,7 @@ instead.")
|
|||
if (defined($heat_clients_keystone_uri)) {
|
||||
$heat_clients_keystone_uri_real = $heat_clients_keystone_uri
|
||||
} else {
|
||||
$heat_clients_keystone_uri_real = $auth_url
|
||||
$heat_clients_keystone_uri_real = $auth_uri
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
The default for the clients_keystone/auth_uri configuration parameter has
|
||||
been updated to use the public Keystone endpoint rather than the admin
|
||||
endpoint, as expected by Heat. To continue using the admin endpoint, use
|
||||
the heat_clients_keystone_uri parameter of the ::heat class.
|
|
@ -138,7 +138,7 @@ describe 'heat' do
|
|||
end
|
||||
|
||||
it 'configures auth_uri for clients_keystone' do
|
||||
is_expected.to contain_heat_config('clients_keystone/auth_uri').with_value( 'http://127.0.0.1:35357/' )
|
||||
is_expected.to contain_heat_config('clients_keystone/auth_uri').with_value( 'http://127.0.0.1:5000/' )
|
||||
end
|
||||
|
||||
it 'configures endpoint_type for clients' do
|
||||
|
|
Loading…
Reference in New Issue