Merge "Barbican: Remove certificate plugin parameters"

This commit is contained in:
Zuul 2024-04-25 16:36:42 +00:00 committed by Gerrit Code Review
commit 982926940a

View File

@ -58,27 +58,26 @@ class openstack_integration::barbican {
service_token_roles_required => true, service_token_roles_required => true,
} }
class { 'barbican::api': class { 'barbican::api':
default_transport_url => os_transport_url({ default_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_default_proto, 'transport' => $::openstack_integration::config::messaging_default_proto,
'host' => $::openstack_integration::config::host, 'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::messaging_default_port, 'port' => $::openstack_integration::config::messaging_default_port,
'username' => 'barbican', 'username' => 'barbican',
'password' => 'an_even_bigger_secret', 'password' => 'an_even_bigger_secret',
}), }),
notification_transport_url => os_transport_url({ notification_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_notify_proto, 'transport' => $::openstack_integration::config::messaging_notify_proto,
'host' => $::openstack_integration::config::host, 'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::messaging_notify_port, 'port' => $::openstack_integration::config::messaging_notify_port,
'username' => 'barbican', 'username' => 'barbican',
'password' => 'an_even_bigger_secret', 'password' => 'an_even_bigger_secret',
}), }),
host_href => "${::openstack_integration::config::base_url}:9311", host_href => "${::openstack_integration::config::base_url}:9311",
auth_strategy => 'keystone', auth_strategy => 'keystone',
service_name => 'httpd', service_name => 'httpd',
enabled_certificate_plugins => ['simple_certificate'], db_auto_create => false,
db_auto_create => false, enable_queue => true,
enable_queue => true, rabbit_use_ssl => $::openstack_integration::config::ssl,
rabbit_use_ssl => $::openstack_integration::config::ssl,
} }
class { 'barbican::wsgi::apache': class { 'barbican::wsgi::apache':
bind_host => $::openstack_integration::config::host, bind_host => $::openstack_integration::config::host,