openstack
/
fuel-library
Code Issues Proposed changes

Merge "Use version-less auth_uri for Murano" into stable/mitaka

This commit is contained in:
Jenkins 2016-05-10 14:34:34 +00:00 committed by Gerrit Code Review
parent 140c47789d 4f8b7d000b
commit f166afc23c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack_tasks/manifests/murano/murano.pp
View File

@ -112,7 +112,7 @@ class openstack_tasks::murano::murano {
log_facility => $syslog_log_facility_murano,
database_connection => $db_connection,
sync_db => $primary_controller,
auth_uri => "${public_auth_protocol}://${public_auth_address}:5000/v3",
auth_uri => "${public_auth_protocol}://${public_auth_address}:5000/",
admin_user => $murano_user,
admin_password => $murano_hash['user_password'],
admin_tenant_name => $tenant,

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

@ -141,7 +141,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/v3",
'auth_uri' => "#{public_auth_protocol}://#{public_auth_address}:5000/",
'admin_user' => murano_user,
'admin_password' => murano_password,
'admin_tenant_name' => tenant,