openstack/fuel-library
Code Issues Proposed changes

Switch murano to keystone API v3 by default

Browse Source 
Keystone API v2 is deprecated, so murano must use v3 API by default.

Change-Id: I87d95c381aee89e6c6c95ab9eddab459550d3ea5
This commit is contained in:
Nikolay Starodubtsev 2016-02-12 12:50:19 +03:00 committed by Alex Schultz
parent 4d183acc32
commit 965f7e01e6
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/osnailyfacter/modular/murano/cfapi.pp
View File

@ -41,7 +41,7 @@ if $murano_cfapi_hash['enabled'] {
tenant => $access_hash['tenant'],
bind_host => $cfapi_bind_host,
bind_port => $cfapi_bind_port,
auth_url => "${public_auth_protocol}://${public_auth_address}:5000/v2.0/",
auth_url => "${public_auth_protocol}://${public_auth_address}:5000/v3",
}
$haproxy_stats_url = "http://${management_ip}:10000/;csv"

2
deployment/puppet/osnailyfacter/modular/murano/murano.pp
View File

@ -101,7 +101,7 @@ if $murano_hash['enabled'] {
log_facility => $syslog_log_facility_murano,
database_connection => $db_connection,
sync_db => $primary_controller,
auth_uri => "${public_auth_protocol}://${public_auth_address}:5000/v2.0/",
auth_uri => "${public_auth_protocol}://${public_auth_address}:5000/v3",
admin_user => $murano_user,
admin_password => $murano_hash['user_password'],
admin_tenant_name => $tenant,

2
tests/noop/spec/hosts/murano/cfapi_spec.rb
View File

@ -70,7 +70,7 @@ describe manifest do
'tenant' => tenant,
'bind_port' => bind_port,
'bind_host' => bind_address,
'auth_url' => "#{public_auth_protocol}://#{public_auth_address}:5000/v2.0/",
'auth_url' => "#{public_auth_protocol}://#{public_auth_address}:5000/v3",
)
end

2
tests/noop/spec/hosts/murano/murano_spec.rb
View File

@ -137,7 +137,7 @@ describe manifest do
'log_facility' => syslog_log_facility_murano,
'database_connection' => sql_connection,
'sync_db' => primary_controller,
'auth_uri' => "#{public_auth_protocol}://#{public_auth_address}:5000/v2.0/",
'auth_uri' => "#{public_auth_protocol}://#{public_auth_address}:5000/v3",
'admin_user' => murano_user,
'admin_password' => murano_password,
'admin_tenant_name' => tenant,