From 9084b42458d815b8f7e2e06f9e2a8639be9d2b74 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 12 Mar 2021 22:28:19 +0900 Subject: [PATCH] Add support for [controller_worker] image_driver Change-Id: I8581d6d858715d0b17266cfad529d2898e746fc2 --- manifests/controller.pp | 6 ++++++ releasenotes/notes/image_driver-37560e3159ece607.yaml | 4 ++++ spec/classes/octavia_controller_spec.rb | 3 +++ 3 files changed, 13 insertions(+) create mode 100644 releasenotes/notes/image_driver-37560e3159ece607.yaml diff --git a/manifests/controller.pp b/manifests/controller.pp index 40625342..ee029c63 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -57,6 +57,10 @@ # (optional) Name of volume driver for managing amphora volumes # 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*] # (optional) Name of Openstack SSH keypair for communicating with amphora # Defaults to 'octavia-ssh-key' @@ -182,6 +186,7 @@ class octavia::controller ( $compute_driver = $::os_service_default, $network_driver = $::os_service_default, $volume_driver = $::os_service_default, + $image_driver = $::os_service_default, $enable_ssh_access = true, $amp_ssh_key_name = 'octavia-ssh-key', $timeout_client_data = $::os_service_default, @@ -237,6 +242,7 @@ class octavia::controller ( 'controller_worker/compute_driver' : value => $compute_driver; 'controller_worker/network_driver' : value => $network_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_member_connect' : value => $timeout_member_connect; 'haproxy_amphora/timeout_member_data' : value => $timeout_member_data; diff --git a/releasenotes/notes/image_driver-37560e3159ece607.yaml b/releasenotes/notes/image_driver-37560e3159ece607.yaml new file mode 100644 index 00000000..482331de --- /dev/null +++ b/releasenotes/notes/image_driver-37560e3159ece607.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``octavia::controller::image_driver`` parameter has been added. diff --git a/spec/classes/octavia_controller_spec.rb b/spec/classes/octavia_controller_spec.rb index 5ba01159..b29a60aa 100644 --- a/spec/classes/octavia_controller_spec.rb +++ b/spec/classes/octavia_controller_spec.rb @@ -25,6 +25,7 @@ describe 'octavia::controller' do :compute_driver => 'sample_compute_driver', :network_driver => 'sample_network_driver', :volume_driver => 'sample_volume_driver', + :image_driver => 'sample_image_driver', :amp_ssh_key_name => 'custom-amphora-key', :timeout_client_data => 60, :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/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/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('haproxy_amphora/timeout_client_data').with_value(60) 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('') is_expected.to contain_octavia_config('controller_worker/network_driver').with_value('') is_expected.to contain_octavia_config('controller_worker/volume_driver').with_value('') + is_expected.to contain_octavia_config('controller_worker/image_driver').with_value('') 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('') is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_connect').with_value('')