openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Merge "Change to www_authenticate_uri for those missed"

This commit is contained in:
Zuul 2018-12-08 21:15:20 +00:00 committed by Gerrit Code Review
parent 7ac353bcf8 3a95cda318
commit c1d468cd84
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/murano.pp
View File

@ -63,7 +63,7 @@ class openstack_integration::murano {
rabbit_own_use_ssl => $::openstack_integration::config::ssl,
database_connection => 'mysql+pymysql://murano:a_big_secret@127.0.0.1/murano?charset=utf8',
identity_uri => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
use_ssl => $::openstack_integration::config::ssl,
service_host => $::openstack_integration::config::ip_for_url,
cert_file => $::openstack_integration::params::cert_path,

12
manifests/trove.pp
View File

@ -54,12 +54,12 @@ class openstack_integration::trove {
admin_url => "${::openstack_integration::config::base_url}:8779/v1.0/%(tenant_id)s",
}
class { '::trove::keystone::authtoken':
password => 'a_big_secret',
user_domain_name => 'Default',
project_domain_name => 'Default',
auth_url => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
password => 'a_big_secret',
user_domain_name => 'Default',
project_domain_name => 'Default',
auth_url => $::openstack_integration::config::keystone_admin_uri,
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
}
class { '::trove::api':
bind_host => $::openstack_integration::config::host,