openstack
/
puppet-octavia
Code Issues Proposed changes

Merge "Add support for [task_flow] jobboard_backend_username"

This commit is contained in:
Zuul 2024-03-14 18:05:20 +00:00 committed by Gerrit Code Review
parent 9f4d1d6132 507ccc98d4
commit 512289ccc5
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/task_flow.pp
View File

@ -33,6 +33,10 @@
# (optional) The port of jobboard backend server.
# Defaults to $facts['os_service_default']
#
# [*jobboard_backend_username*]
# (optional) User name for the jobboard backend server.
# Defaults to $facts['os_service_default']
#
# [*jobboard_backend_password*]
# (optional) Password for the jobboard backend server.
# Defaults to $facts['os_service_default']
@ -73,6 +77,7 @@ class octavia::task_flow (
$jobboard_backend_driver = $facts['os_service_default'],
$jobboard_backend_hosts = $facts['os_service_default'],
$jobboard_backend_port = $facts['os_service_default'],
$jobboard_backend_username = $facts['os_service_default'],
$jobboard_backend_password = $facts['os_service_default'],
$jobboard_backend_namespace = $facts['os_service_default'],
$jobboard_redis_sentinel = $facts['os_service_default'],
@ -102,6 +107,7 @@ class octavia::task_flow (
'task_flow/jobboard_backend_driver' : value => $jobboard_backend_driver;
'task_flow/jobboard_backend_hosts' : value => join(any2array($jobboard_backend_hosts), ',');
'task_flow/jobboard_backend_port' : value => $jobboard_backend_port;
'task_flow/jobboard_backend_username' : value => $jobboard_backend_username;
'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;

5
releasenotes/notes/jobboard_backend_username-bb192a3a436c75c6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The ``octavia::task_flow::jobboard_backend_username`` parameter has been
added.

3
spec/classes/octavia_task_flow_spec.rb
View File

@ -11,6 +11,7 @@ describe 'octavia::task_flow' do
should contain_octavia_config('task_flow/jobboard_enabled').with_value('<SERVICE DEFAULT>')
should contain_octavia_config('task_flow/jobboard_backend_hosts').with_value('<SERVICE DEFAULT>')
should contain_octavia_config('task_flow/jobboard_backend_port').with_value('<SERVICE DEFAULT>')
should contain_octavia_config('task_flow/jobboard_backend_username').with_value('<SERVICE DEFAULT>')
should contain_octavia_config('task_flow/jobboard_backend_password').with_value('<SERVICE DEFAULT>').with_secret(true)
should contain_octavia_config('task_flow/jobboard_backend_namespace').with_value('<SERVICE DEFAULT>')
should contain_octavia_config('task_flow/jobboard_redis_sentinel').with_value('<SERVICE DEFAULT>')
@ -32,6 +33,7 @@ describe 'octavia::task_flow' do
:jobboard_enabled => true,
:jobboard_backend_hosts => ['192.168.0.2', '192.168.0.3'],
:jobboard_backend_port => 6379,
:jobboard_backend_username => 'user',
:jobboard_backend_password => 'secret',
:jobboard_backend_namespace => 'octavia_jobboard',
:jobboard_redis_sentinel => 'sentinel',
@ -51,6 +53,7 @@ describe 'octavia::task_flow' do
should contain_octavia_config('task_flow/jobboard_enabled').with_value(true)
should contain_octavia_config('task_flow/jobboard_backend_hosts').with_value('192.168.0.2,192.168.0.3')
should contain_octavia_config('task_flow/jobboard_backend_port').with_value(6379)
should contain_octavia_config('task_flow/jobboard_backend_username').with_value('user')
should contain_octavia_config('task_flow/jobboard_backend_password').with_value('secret').with_secret(true)
should contain_octavia_config('task_flow/jobboard_backend_namespace').with_value('octavia_jobboard')
should contain_octavia_config('task_flow/jobboard_redis_sentinel').with_value('sentinel')