openstack/puppet-octavia
Code Issues Proposed changes

Add support for [controller_worker] image_driver

Browse Source 
Change-Id: I8581d6d858715d0b17266cfad529d2898e746fc2
This commit is contained in:
Takashi Kajinami 2021-03-12 22:28:19 +09:00
parent ebf7fdc31c
commit 9084b42458
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/controller.pp
View File

@ -57,6 +57,10 @@
# (optional) Name of volume driver for managing amphora volumes # (optional) Name of volume driver for managing amphora volumes
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*image_driver*]
# (optional) Name of volume driver for managing amphora image
# Defaults to $::os_service_default
#
# [*amp_ssh_key_name*] # [*amp_ssh_key_name*]
# (optional) Name of Openstack SSH keypair for communicating with amphora # (optional) Name of Openstack SSH keypair for communicating with amphora
# Defaults to 'octavia-ssh-key' # Defaults to 'octavia-ssh-key'
@ -182,6 +186,7 @@ class octavia::controller (
$compute_driver = $::os_service_default, $compute_driver = $::os_service_default,
$network_driver = $::os_service_default, $network_driver = $::os_service_default,
$volume_driver = $::os_service_default, $volume_driver = $::os_service_default,
$image_driver = $::os_service_default,
$enable_ssh_access = true, $enable_ssh_access = true,
$amp_ssh_key_name = 'octavia-ssh-key', $amp_ssh_key_name = 'octavia-ssh-key',
$timeout_client_data = $::os_service_default, $timeout_client_data = $::os_service_default,
@ -237,6 +242,7 @@ class octavia::controller (
'controller_worker/compute_driver' : value => $compute_driver; 'controller_worker/compute_driver' : value => $compute_driver;
'controller_worker/network_driver' : value => $network_driver; 'controller_worker/network_driver' : value => $network_driver;
'controller_worker/volume_driver' : value => $volume_driver; 'controller_worker/volume_driver' : value => $volume_driver;
'controller_worker/image_driver' : value => $image_driver;
'haproxy_amphora/timeout_client_data' : value => $timeout_client_data; 'haproxy_amphora/timeout_client_data' : value => $timeout_client_data;
'haproxy_amphora/timeout_member_connect' : value => $timeout_member_connect; 'haproxy_amphora/timeout_member_connect' : value => $timeout_member_connect;
'haproxy_amphora/timeout_member_data' : value => $timeout_member_data; 'haproxy_amphora/timeout_member_data' : value => $timeout_member_data;

4
releasenotes/notes/image_driver-37560e3159ece607.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``octavia::controller::image_driver`` parameter has been added.

3
spec/classes/octavia_controller_spec.rb
View File

@ -25,6 +25,7 @@ describe 'octavia::controller' do
:compute_driver => 'sample_compute_driver', :compute_driver => 'sample_compute_driver',
:network_driver => 'sample_network_driver', :network_driver => 'sample_network_driver',
:volume_driver => 'sample_volume_driver', :volume_driver => 'sample_volume_driver',
:image_driver => 'sample_image_driver',
:amp_ssh_key_name => 'custom-amphora-key', :amp_ssh_key_name => 'custom-amphora-key',
:timeout_client_data => 60, :timeout_client_data => 60,
:timeout_member_connect => 5, :timeout_member_connect => 5,
@ -64,6 +65,7 @@ describe 'octavia::controller' do
is_expected.to contain_octavia_config('controller_worker/compute_driver').with_value('sample_compute_driver') is_expected.to contain_octavia_config('controller_worker/compute_driver').with_value('sample_compute_driver')
is_expected.to contain_octavia_config('controller_worker/network_driver').with_value('sample_network_driver') is_expected.to contain_octavia_config('controller_worker/network_driver').with_value('sample_network_driver')
is_expected.to contain_octavia_config('controller_worker/volume_driver').with_value('sample_volume_driver') 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_ssh_key_name').with_value('custom-amphora-key')
is_expected.to contain_octavia_config('haproxy_amphora/timeout_client_data').with_value(60) 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_connect').with_value(5)
@ -103,6 +105,7 @@ describe 'octavia::controller' do
is_expected.to contain_octavia_config('controller_worker/compute_driver').with_value('<SERVICE DEFAULT>') is_expected.to contain_octavia_config('controller_worker/compute_driver').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('controller_worker/network_driver').with_value('<SERVICE DEFAULT>') is_expected.to contain_octavia_config('controller_worker/network_driver').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('controller_worker/volume_driver').with_value('<SERVICE DEFAULT>') 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_ssh_key_name').with_value('octavia-ssh-key')
is_expected.to contain_octavia_config('haproxy_amphora/timeout_client_data').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_connect').with_value('<SERVICE DEFAULT>')