openstack/puppet-octavia
Code Issues Proposed changes

Support more [certificates] options

Browse Source 
Change-Id: I01e705c6500e5533a739719dcf00129f690b08bd
This commit is contained in:
Takashi Kajinami 2022-03-24 13:58:16 +09:00
parent c61f54f2b9
commit 753b692799
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/certificates.pp
View File

@ -12,6 +12,18 @@
# (Optional) Certificate manager to use.
# Defaults to $::os_service_default
#
# [*barbican_auth*]
# (Optional) Name of the Barbican authentication method to use.
# Defaults to $::os_service_default
#
# [*service_name*]
# (Optional) The name of the certificate service in the keystone catalog.
# Defaults to $::os_service_default
#
# [*endpoint*]
# (Optional) A new endpoint to override the endpoint in the keystone catalog.
# Defaults to $::os_service_default
#
# [*region_name*]
# (Optional) Region name to use when connecting to cert manager.
# Defaults to $::os_service_default
@ -76,6 +88,9 @@
class octavia::certificates (
$cert_generator = $::os_service_default,
$cert_manager = $::os_service_default,
$barbican_auth = $::os_service_default,
$service_name = $::os_service_default,
$endpoint = $::os_service_default,
$region_name = $::os_service_default,
$endpoint_type = $::os_service_default,
$ca_certificate = $::os_service_default,
@ -99,6 +114,9 @@ class octavia::certificates (
octavia_config {
'certificates/cert_generator' : value => $cert_generator;
'certificates/cert_manager' : value => $cert_manager;
'certificates/barbican_auth' : value => $barbican_auth;
'certificates/service_name' : value => $service_name;
'certificates/endpoint' : value => $endpoint;
'certificates/region_name' : value => $region_name;
'certificates/endpoint_type' : value => $endpoint_type;
'certificates/ca_certificate' : value => $ca_certificate;

8
releasenotes/notes/certificates-opts-4913f5eb2ecfca0c.yaml Normal file
View File

@ -0,0 +1,8 @@
---
features:
- |
The ``octavia::certificates`` class now supports the following parameters.
- ``barbican_auth``
- ``service_name``
- ``endpoint``

9
spec/classes/octavia_certificates_spec.rb
View File

@ -7,6 +7,9 @@ describe 'octavia::certificates' do
it 'configures octavia certificate manager' do
is_expected.to contain_octavia_config('certificates/cert_generator').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('certificates/cert_manager').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('certificates/barbican_auth').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('certificates/service_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('certificates/endpoint').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('certificates/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('certificates/endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('certificates/ca_certificate').with_value('<SERVICE DEFAULT>')
@ -25,6 +28,9 @@ describe 'octavia::certificates' do
let :params do
{ :cert_generator => 'local_cert_generator',
:cert_manager => 'barbican_cert_manager',
:barbican_auth => 'barbican_acl_auth',
:service_name => 'barbican',
:endpoint => 'http://localhost:9311',
:region_name => 'RegionOne',
:endpoint_type => 'internalURL',
:ca_certificate => '/etc/octavia/ca.pem',
@ -38,6 +44,9 @@ describe 'octavia::certificates' do
it 'configures octavia certificate manager' do
is_expected.to contain_octavia_config('certificates/cert_generator').with_value('local_cert_generator')
is_expected.to contain_octavia_config('certificates/cert_manager').with_value('barbican_cert_manager')
is_expected.to contain_octavia_config('certificates/barbican_auth').with_value('barbican_acl_auth')
is_expected.to contain_octavia_config('certificates/service_name').with_value('barbican')
is_expected.to contain_octavia_config('certificates/endpoint').with_value('http://localhost:9311')
is_expected.to contain_octavia_config('certificates/region_name').with_value('RegionOne')
is_expected.to contain_octavia_config('certificates/endpoint_type').with_value('internalURL')
is_expected.to contain_octavia_config('certificates/ca_certificate').with_value('/etc/octavia/ca.pem')