openstack/puppet-openstack-integration
Code Issues Proposed changes

zaqar: Fix incomplete trustee options

Browse Source 
The trustee option should contain the complete credential information
for authentication.

Change-Id: I4c6a8fc97e9632867436d2287fd28fa50a1eec08
This commit is contained in:
Takashi Kajinami
2023-12-18 11:15:38 +09:00
parent cf25016c9b
commit b34458f375
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/zaqar.pp
View File

@@ -30,7 +30,11 @@ class openstack_integration::zaqar {
internal_url => "ws://${::openstack_integration::config::ip_for_url}:8888", internal_url => "ws://${::openstack_integration::config::ip_for_url}:8888",
admin_url => "ws://${::openstack_integration::config::ip_for_url}:8888", admin_url => "ws://${::openstack_integration::config::ip_for_url}:8888",
} }
class {'zaqar::management::sqlalchemy': class { 'zaqar::keystone::trust':
auth_url => "${::openstack_integration::config::keystone_auth_uri}/v3",
password => 'a_big_secret'
}
class { 'zaqar::management::sqlalchemy':
uri => os_database_connection({ uri => os_database_connection({
'dialect' => 'mysql+pymysql', 'dialect' => 'mysql+pymysql',
'host' => $::openstack_integration::config::ip_for_url, 'host' => $::openstack_integration::config::ip_for_url,
@@ -41,11 +45,11 @@ class openstack_integration::zaqar {
'extra' => $::openstack_integration::config::db_extra, 'extra' => $::openstack_integration::config::db_extra,
}), }),
} }
class {'zaqar::messaging::swift': class { 'zaqar::messaging::swift':
auth_url => "${::openstack_integration::config::keystone_auth_uri}/v3", auth_url => "${::openstack_integration::config::keystone_auth_uri}/v3",
uri => 'swift://zaqar:a_big_secret@/services', uri => 'swift://zaqar:a_big_secret@/services',
} }
class {'zaqar::keystone::authtoken': class { 'zaqar::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
user_domain_name => 'Default', user_domain_name => 'Default',
project_domain_name => 'Default', project_domain_name => 'Default',
@@ -54,12 +58,12 @@ class openstack_integration::zaqar {
memcached_servers => $::openstack_integration::config::memcached_servers, memcached_servers => $::openstack_integration::config::memcached_servers,
service_token_roles_required => true, service_token_roles_required => true,
} }
class {'zaqar': class { 'zaqar':
unreliable => true, unreliable => true,
management_store => 'sqlalchemy', management_store => 'sqlalchemy',
message_store => 'swift', message_store => 'swift',
} }
class {'zaqar::server': class { 'zaqar::server':
service_name => 'httpd', service_name => 'httpd',
} }
class { 'zaqar::wsgi::apache': class { 'zaqar::wsgi::apache':