openstack
/
puppet-octavia
Code Issues Proposed changes

Allow amphora timezone configuration 

Adds support for the ``[controller_worker] amp_timezone`` configuration
parameter. It allows to configure the timezone of the amphora.

Depends-On: https://review.opendev.org/c/openstack/octavia/+/839937
Change-Id: I9a2cfddfa2e91fde8280c4cab4c51d05ae436ae5
This commit is contained in:
Tom Weininger 2022-05-17 12:30:18 +02:00
parent c7dd10a34f
commit b5ab3de4bc
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/controller.pp
View File

@ -61,6 +61,11 @@
# (optional) Name of volume driver for managing amphora image
# Defaults to $::os_service_default
#
# [*amp_timezone*]
# (optional) Defines the timezone to use as represented in
# /usr/share/zoneinfo.
# Default is $::os_service_default
#
# [*amp_ssh_key_name*]
# (optional) Name of Openstack SSH keypair for communicating with amphora
# Defaults to 'octavia-ssh-key'
@ -220,6 +225,7 @@ class octavia::controller (
$network_driver = $::os_service_default,
$volume_driver = $::os_service_default,
$image_driver = $::os_service_default,
$amp_timezone = $::os_service_default,
$enable_ssh_access = true,
$amp_ssh_key_name = 'octavia-ssh-key',
$timeout_client_data = $::os_service_default,
@ -290,6 +296,7 @@ Use the octavia::networking class instead')
'controller_worker/network_driver' : value => $network_driver;
'controller_worker/volume_driver' : value => $volume_driver;
'controller_worker/image_driver' : value => $image_driver;
'controller_worker/amp_timezone' : value => $amp_timezone;
'haproxy_amphora/timeout_client_data' : value => $timeout_client_data;
'haproxy_amphora/timeout_member_connect' : value => $timeout_member_connect;
'haproxy_amphora/timeout_member_data' : value => $timeout_member_data;

5
releasenotes/notes/set-amphora-timezone-103b078b31ab7aeb.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Adds support for the ``[controller_worker] amp_timezone`` configuration
parameter. It allows to configure the timezone of the amphora.

3
spec/classes/octavia_controller_spec.rb
View File

@ -27,6 +27,7 @@ describe 'octavia::controller' do
:volume_driver => 'sample_volume_driver',
:image_driver => 'sample_image_driver',
:amp_ssh_key_name => 'custom-amphora-key',
:amp_timezone => 'UTC',
:timeout_client_data => 60,
:timeout_member_connect => 5,
:timeout_member_data => 60,
@ -74,6 +75,7 @@ describe 'octavia::controller' do
is_expected.to contain_octavia_config('controller_worker/volume_driver').with_value('sample_volume_driver')
is_expected.to contain_octavia_config('controller_worker/image_driver').with_value('sample_image_driver')
is_expected.to contain_octavia_config('controller_worker/amp_ssh_key_name').with_value('custom-amphora-key')
is_expected.to contain_octavia_config('controller_worker/amp_timezone').with_value('UTC')
is_expected.to contain_octavia_config('haproxy_amphora/timeout_client_data').with_value(60)
is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_connect').with_value(5)
is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value(60)
@ -121,6 +123,7 @@ describe 'octavia::controller' do
is_expected.to contain_octavia_config('controller_worker/volume_driver').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('controller_worker/image_driver').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('controller_worker/amp_ssh_key_name').with_value('octavia-ssh-key')
is_expected.to contain_octavia_config('controller_worker/amp_timezone').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/timeout_client_data').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_connect').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value('<SERVICE DEFAULT>')