starlingx
/
config
Code Issues Proposed changes

Merge "Fix domain setting for Barbican during bootstrap"

This commit is contained in:
Zuul 2019-07-16 14:00:09 +00:00 committed by Gerrit Code Review
parent 320af02b02 96ecfd2542
commit 0d50a14b71
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
puppet-manifests/src/modules/openstack/manifests/barbican.pp
View File

@ -139,7 +139,10 @@ class openstack::barbican::bootstrap
configure_user_role => false,
}
class { '::barbican::keystone::authtoken':
auth_url => 'http://localhost:5000',
auth_url => 'http://localhost:5000',
project_name => 'services',
user_domain_name => 'Default',
project_domain_name => 'Default',
}
$bu_name = $::barbican::keystone::auth::auth_name

6
puppet-manifests/src/modules/openstack/manifests/keystone.pp
View File

@ -335,11 +335,7 @@ class openstack::keystone::endpoint::runtime {
include ::patching::keystone::auth
include ::nfv::keystone::auth
include ::fm::keystone::auth
include ::openstack::barbican::params
if $::openstack::barbican::params::service_enabled {
include ::barbican::keystone::auth
}
include ::barbican::keystone::auth
if $::platform::params::distributed_cloud_role =='systemcontroller' {
include ::dcorch::keystone::auth