openstack/puppet-neutron
Code Issues Proposed changes

Add cafile parameter to neutron::designate

Browse Source 
This parameter was missing, preventing using a self-signed cert.

Change-Id: I2e2ad8dd59c290c0d5f320a62ce81bf97e77ca90
This commit is contained in:
Thomas Goirand
2021-11-19 09:58:03 +01:00
committed by Takashi Kajinami
parent 989282da3b
commit 2f9c0280bb
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/designate.pp
View File

@@ -41,6 +41,15 @@
# determined using auth_url # determined using auth_url
# Defaults to 'http://127.0.0.1:5000' # Defaults to 'http://127.0.0.1:5000'
# #
# [*cafile*]
# (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs
# connections.
# Defaults to $::os_service_default.
#
# [*certfile*]
# (Optional) Required if identity server requires client certificate
# Defaults to $::os_service_default.
#
# [*allow_reverse_dns_lookup*] # [*allow_reverse_dns_lookup*]
# (optional) Enable or not the creation of reverse lookup (PTR) records. # (optional) Enable or not the creation of reverse lookup (PTR) records.
# #
@@ -70,6 +79,8 @@ class neutron::designate (
$project_domain_name = 'Default', $project_domain_name = 'Default',
$system_scope = $::os_service_default, $system_scope = $::os_service_default,
$auth_url = 'http://127.0.0.1:5000', $auth_url = 'http://127.0.0.1:5000',
$cafile = $::os_service_default,
$certfile = $::os_service_default,
$allow_reverse_dns_lookup = $::os_service_default, $allow_reverse_dns_lookup = $::os_service_default,
$ipv4_ptr_zone_prefix_size = $::os_service_default, $ipv4_ptr_zone_prefix_size = $::os_service_default,
$ipv6_ptr_zone_prefix_size = $::os_service_default, $ipv6_ptr_zone_prefix_size = $::os_service_default,
@@ -106,6 +117,8 @@ class neutron::designate (
'designate/project_domain_name': value => $project_domain_name_real; 'designate/project_domain_name': value => $project_domain_name_real;
'designate/system_scope': value => $system_scope; 'designate/system_scope': value => $system_scope;
'designate/auth_url': value => $auth_url; 'designate/auth_url': value => $auth_url;
'designate/cafile': value => $cafile;
'designate/certfile': value => $certfile;
'designate/allow_reverse_dns_lookup': value => $allow_reverse_dns_lookup; 'designate/allow_reverse_dns_lookup': value => $allow_reverse_dns_lookup;
'designate/ipv4_ptr_zone_prefix_size': value => $ipv4_ptr_zone_prefix_size; 'designate/ipv4_ptr_zone_prefix_size': value => $ipv4_ptr_zone_prefix_size;
'designate/ipv6_ptr_zone_prefix_size': value => $ipv6_ptr_zone_prefix_size; 'designate/ipv6_ptr_zone_prefix_size': value => $ipv6_ptr_zone_prefix_size;

6
releasenotes/notes/designate-ca-file-2d6e9213a67f1ec5.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
features:
- |
The ``neutron::designate`` class has now the new parameters, ``cafile`` and
``certfile``, to allow using a self-signed certificate for the Designate
API.

27
spec/classes/neutron_designate_spec.rb
View File

@@ -19,10 +19,13 @@ describe 'neutron::designate' do
should contain_neutron_config('designate/auth_type').with_value('password') should contain_neutron_config('designate/auth_type').with_value('password')
should contain_neutron_config('designate/username').with_value('neutron') should contain_neutron_config('designate/username').with_value('neutron')
should contain_neutron_config('designate/user_domain_name').with_value('Default') should contain_neutron_config('designate/user_domain_name').with_value('Default')
should contain_neutron_config('designate/project_id').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/project_name').with_value('services') should contain_neutron_config('designate/project_name').with_value('services')
should contain_neutron_config('designate/project_domain_name').with_value('Default') should contain_neutron_config('designate/project_domain_name').with_value('Default')
should contain_neutron_config('designate/system_scope').with_value('<SERVICE DEFAULT>') should contain_neutron_config('designate/system_scope').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/auth_url').with_value('http://127.0.0.1:5000') should contain_neutron_config('designate/auth_url').with_value('http://127.0.0.1:5000')
should contain_neutron_config('designate/cafile').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/certfile').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/allow_reverse_dns_lookup').with_value('<SERVICE DEFAULT>') should contain_neutron_config('designate/allow_reverse_dns_lookup').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/ipv4_ptr_zone_prefix_size').with_value('<SERVICE DEFAULT>') should contain_neutron_config('designate/ipv4_ptr_zone_prefix_size').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/ipv6_ptr_zone_prefix_size').with_value('<SERVICE DEFAULT>') should contain_neutron_config('designate/ipv6_ptr_zone_prefix_size').with_value('<SERVICE DEFAULT>')
@@ -33,13 +36,15 @@ describe 'neutron::designate' do
context 'with provided parameters' do context 'with provided parameters' do
let :params do let :params do
req_params.merge!({ req_params.merge!({
:auth_type => 'token', :auth_type => 'v3password',
:username => 'user', :username => 'alt_neutron',
:user_domain_name => 'Domain2', :user_domain_name => 'Domain2',
:project_id => 'id1', :project_id => '53eceb0b-9913-4c0c-883d-3f43d90dcf9c',
:project_name => 'proj', :project_name => 'alt_service',
:project_domain_name => 'Domain1', :project_domain_name => 'Domain1',
:auth_url => 'http://auth/', :auth_url => 'http://localhost:5000',
:cafile => '/path/to/cafile',
:certfile => '/path/to/certfile',
:allow_reverse_dns_lookup => false, :allow_reverse_dns_lookup => false,
:ipv4_ptr_zone_prefix_size => 765, :ipv4_ptr_zone_prefix_size => 765,
:ipv6_ptr_zone_prefix_size => 876, :ipv6_ptr_zone_prefix_size => 876,
@@ -51,14 +56,16 @@ describe 'neutron::designate' do
should contain_neutron_config('DEFAULT/external_dns_driver').with_value('designate') should contain_neutron_config('DEFAULT/external_dns_driver').with_value('designate')
should contain_neutron_config('designate/url').with_value('http://ip/designate') should contain_neutron_config('designate/url').with_value('http://ip/designate')
should contain_neutron_config('designate/password').with_value('secret').with_secret(true) should contain_neutron_config('designate/password').with_value('secret').with_secret(true)
should contain_neutron_config('designate/auth_type').with_value('token') should contain_neutron_config('designate/auth_type').with_value('v3password')
should contain_neutron_config('designate/username').with_value('user') should contain_neutron_config('designate/username').with_value('alt_neutron')
should contain_neutron_config('designate/user_domain_name').with_value('Domain2') should contain_neutron_config('designate/user_domain_name').with_value('Domain2')
should contain_neutron_config('designate/project_id').with_value('id1') should contain_neutron_config('designate/project_id').with_value('53eceb0b-9913-4c0c-883d-3f43d90dcf9c')
should contain_neutron_config('designate/project_name').with_value('proj') should contain_neutron_config('designate/project_name').with_value('alt_service')
should contain_neutron_config('designate/project_domain_name').with_value('Domain1') should contain_neutron_config('designate/project_domain_name').with_value('Domain1')
should contain_neutron_config('designate/system_scope').with_value('<SERVICE DEFAULT>') should contain_neutron_config('designate/system_scope').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/auth_url').with_value('http://auth/') should contain_neutron_config('designate/auth_url').with_value('http://localhost:5000')
should contain_neutron_config('designate/cafile').with_value('/path/to/cafile')
should contain_neutron_config('designate/certfile').with_value('/path/to/certfile')
should contain_neutron_config('designate/allow_reverse_dns_lookup').with_value(false) should contain_neutron_config('designate/allow_reverse_dns_lookup').with_value(false)
should contain_neutron_config('designate/ipv4_ptr_zone_prefix_size').with_value(765) should contain_neutron_config('designate/ipv4_ptr_zone_prefix_size').with_value(765)
should contain_neutron_config('designate/ipv6_ptr_zone_prefix_size').with_value(876) should contain_neutron_config('designate/ipv6_ptr_zone_prefix_size').with_value(876)