From 6c768b0c91d015d6ab9046b408d649eb0dcf722c Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Fri, 19 Oct 2018 15:38:04 +0200 Subject: [PATCH] Do not set inexistent haproxy_amphora/key_path Configuration option [haproxy_amphora]/key_path was removed from Octavia long ago (Mitaka). Change-Id: Ida13f23a6f85e279da166844cab3c40d994b14e4 --- manifests/worker.pp | 3 --- .../remove-haproxy-amphora-key-path-bf21706a6504e28f.yaml | 4 ++++ spec/classes/octavia_worker_spec.rb | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/remove-haproxy-amphora-key-path-bf21706a6504e28f.yaml diff --git a/manifests/worker.pp b/manifests/worker.pp index a51c3971..6f242507 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -224,11 +224,9 @@ class octavia::worker ( if $enable_ssh_access { $ssh_key_name_real = $amp_ssh_key_name - $key_path_real = $key_path } else { $ssh_key_name_real = $::os_service_default - $key_path_real = $::os_service_default } octavia_config { @@ -242,7 +240,6 @@ class octavia::worker ( 'controller_worker/compute_driver' : value => $compute_driver; 'controller_worker/network_driver' : value => $network_driver; 'controller_worker/amp_ssh_key_name' : value => $ssh_key_name_real; - 'haproxy_amphora/key_path' : value => $key_path_real; '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/remove-haproxy-amphora-key-path-bf21706a6504e28f.yaml b/releasenotes/notes/remove-haproxy-amphora-key-path-bf21706a6504e28f.yaml new file mode 100644 index 00000000..5a68718a --- /dev/null +++ b/releasenotes/notes/remove-haproxy-amphora-key-path-bf21706a6504e28f.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - Octavia option [haproxy_amphora]/key_path will no longer be set. None of + the maintained Octavia releases support it (removed in Mitaka). diff --git a/spec/classes/octavia_worker_spec.rb b/spec/classes/octavia_worker_spec.rb index 7d41d69f..0fa1e918 100644 --- a/spec/classes/octavia_worker_spec.rb +++ b/spec/classes/octavia_worker_spec.rb @@ -51,7 +51,6 @@ describe 'octavia::worker' do it { is_expected.to contain_octavia_config('controller_worker/amp_boot_network_list').with_value(['lbnet1', 'lbnet2']) } it { is_expected.to contain_octavia_config('controller_worker/loadbalancer_topology').with_value('SINGLE') } it { is_expected.to contain_octavia_config('controller_worker/amp_ssh_key_name').with_value('custom-amphora-key') } - it { is_expected.to contain_octavia_config('haproxy_amphora/key_path').with_value('/opt/octavia/ssh/amphora_key') } it 'deploys a nova flavor for amphora' do is_expected.to contain_nova_flavor('octavia_42').with( :ensure => 'present', @@ -73,7 +72,6 @@ describe 'octavia::worker' do is_expected.to contain_octavia_config('controller_worker/compute_driver').with_value('compute_nova_driver') is_expected.to contain_octavia_config('controller_worker/network_driver').with_value('allowed_address_pairs_driver') 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/key_path').with_value('/etc/octavia/.ssh/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('') is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value('') @@ -86,7 +84,6 @@ describe 'octavia::worker' do it 'disables configuration of SSH key properties' do is_expected.to contain_octavia_config('controller_worker/amp_ssh_key_name').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/key_path').with_value('') end end