openstack
/
puppet-octavia
Code Issues Proposed changes

Merge "Support hash values for jobboard_*_ssl_options"

This commit is contained in:
Zuul 2023-03-23 17:16:46 +00:00 committed by Gerrit Code Review
parent e3fbdf14c9 245a31f0c6
commit b25d48f95d
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/task_flow.pp
View File

@ -85,6 +85,15 @@ class octavia::task_flow (
include octavia::deps
$jobboard_redis_backend_ssl_options_real = $jobboard_redis_backend_ssl_options ? {
Hash => join(join_keys_to_values($jobboard_redis_backend_ssl_options, ':'), ','),
default => join(any2array($jobboard_redis_backend_ssl_options), ','),
}
$jobboard_zookeeper_ssl_options_real = $jobboard_zookeeper_ssl_options ? {
Hash => join(join_keys_to_values($jobboard_zookeeper_ssl_options, ':'), ','),
default => join(any2array($jobboard_zookeeper_ssl_options), ','),
}
octavia_config {
'task_flow/engine' : value => $engine;
'task_flow/max_workers' : value => $max_workers;
@ -96,8 +105,8 @@ class octavia::task_flow (
'task_flow/jobboard_backend_password' : value => $jobboard_backend_password, secret => true;
'task_flow/jobboard_backend_namespace' : value => $jobboard_backend_namespace;
'task_flow/jobboard_redis_sentinel' : value => $jobboard_redis_sentinel;
'task_flow/jobboard_redis_backend_ssl_options' : value => join(any2array($jobboard_redis_backend_ssl_options), ',');
'task_flow/jobboard_zookeeper_ssl_options' : value => join(any2array($jobboard_zookeeper_ssl_options), ',');
'task_flow/jobboard_redis_backend_ssl_options' : value => $jobboard_redis_backend_ssl_options_real;
'task_flow/jobboard_zookeeper_ssl_options' : value => $jobboard_zookeeper_ssl_options_real;
'task_flow/jobboard_expiration_time' : value => $jobboard_expiration_time;
'task_flow/jobboard_save_logbook' : value => $jobboard_save_logbook;
'task_flow/persistence_connection' : value => $persistence_connection;

20
spec/classes/octavia_task_flow_spec.rb
View File

@ -61,6 +61,26 @@ describe 'octavia::task_flow' do
should contain_octavia_config('task_flow/persistence_connection').with_value('sqlite://')
}
end
context 'with ssl options set to dict' do
let :params do
{
:jobboard_redis_backend_ssl_options => {
'ssl' => 'false',
'ssl_keyfile' => 'None'
},
:jobboard_zookeeper_ssl_options => {
'use_ssl' => 'false',
'keyfile' => 'None'
},
}
end
it {
should contain_octavia_config('task_flow/jobboard_redis_backend_ssl_options').with_value('ssl:false,ssl_keyfile:None')
should contain_octavia_config('task_flow/jobboard_zookeeper_ssl_options').with_value('use_ssl:false,keyfile:None')
}
end
end
on_supported_os({