From 1e3f78e475d758ea325d10d9bdccc8e4686dafe5 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 19 Apr 2024 02:01:44 +0900 Subject: [PATCH] Barbican: Remove certificate plugin parameters ... because these were deprecated during the previous cycle. Depends-on: https://review.opendev.org/912039 Change-Id: I0f7c288ca0b3e3bdf7b866cc358e6efe84b65bb4 --- manifests/barbican.pp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/manifests/barbican.pp b/manifests/barbican.pp index 00e221f6c..6942601cc 100644 --- a/manifests/barbican.pp +++ b/manifests/barbican.pp @@ -58,27 +58,26 @@ class openstack_integration::barbican { service_token_roles_required => true, } class { 'barbican::api': - default_transport_url => os_transport_url({ + 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({ + 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', - enabled_certificate_plugins => ['simple_certificate'], - db_auto_create => false, - enable_queue => true, - rabbit_use_ssl => $::openstack_integration::config::ssl, + 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, } class { 'barbican::wsgi::apache': bind_host => $::openstack_integration::config::host,