openstack/puppet-openstack-integration
Code Issues Proposed changes

barbican: Use messaging/queue options from the base class

Browse Source 
The ones in the api class were deprecated to support multi-node
deployments.

Also remove a few redundant parameters.

Depends-on: https://review.opendev.org/932283
Change-Id: I24be6060a1ba2ce505ccf77a60a1673be1c01045
This commit is contained in:
Takashi Kajinami 2024-10-13 21:27:16 +09:00
parent 00b367b2dd
commit 3ca8d4ed00
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
manifests/barbican.pp
View File

@ -16,7 +16,24 @@ class openstack_integration::barbican {
Exec['update-ca-certificates'] ~> Service['httpd']
}
include barbican
class { 'barbican':
default_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_default_proto,
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::messaging_default_port,
'username' => 'barbican',
'password' => 'an_even_bigger_secret',
}),
notification_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_notify_proto,
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::messaging_notify_port,
'username' => 'barbican',
'password' => 'an_even_bigger_secret',
}),
queue_enable => true,
rabbit_use_ssl => $::openstack_integration::config::ssl,
}
class { 'barbican::db::mysql':
charset => $::openstack_integration::params::mysql_charset,
collate => $::openstack_integration::params::mysql_collate,
@ -58,26 +75,8 @@ class openstack_integration::barbican {
service_token_roles_required => true,
}
class { 'barbican::api':
default_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_default_proto,
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::messaging_default_port,
'username' => 'barbican',
'password' => 'an_even_bigger_secret',
}),
notification_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_notify_proto,
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::messaging_notify_port,
'username' => 'barbican',
'password' => 'an_even_bigger_secret',
}),
host_href => "${::openstack_integration::config::base_url}:9311",
auth_strategy => 'keystone',
service_name => 'httpd',
db_auto_create => false,
enable_queue => true,
rabbit_use_ssl => $::openstack_integration::config::ssl,
host_href => "${::openstack_integration::config::base_url}:9311",
service_name => 'httpd',
}
class { 'barbican::wsgi::apache':
bind_host => $::openstack_integration::config::host,