openstack
/
puppet-octavia
Code Issues Proposed changes

Add worker configuration for amphora communication. 

Adding the configuration for amp_ssh_key_name, key_path.

Change-Id: I216b6fa8facffcbe7ccd8ee579e393244c847450
This commit is contained in:
Or Idgar 2017-07-18 16:04:39 +00:00 committed by Mohammed Naser
parent a16691710b
commit 3d72b70554
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/worker.pp
View File

@ -63,6 +63,14 @@
# for amphorae.
# Defaults to 'allowed_address_pairs_driver' (neutron based)
#
# [*amp_ssh_key_name*]
# (optional) Name of Openstack SSH keypair for communicating with amphora
# Defaults to 'octavia-ssh-key'
#
# [*key_path*]
# (optional) full path to the private key for the amphora SSH key
# Defaults to '/etc/octavia/.ssh/octavia_ssh_key'
#
class octavia::worker (
$manage_service = true,
$enabled = true,
@ -76,7 +84,9 @@ class octavia::worker (
$nova_flavor_config = {},
$amphora_driver = 'amphora_haproxy_rest_driver',
$compute_driver = 'compute_nova_driver',
$network_driver = 'allowed_address_pairs_driver'
$network_driver = 'allowed_address_pairs_driver',
$amp_ssh_key_name = 'octavia-ssh-key',
$key_path = '/etc/octavia/.ssh/octavia_ssh_key'
) inherits octavia::params {
include ::octavia::deps
@ -141,5 +151,7 @@ class octavia::worker (
'controller_worker/amphora_driver' : value => $amphora_driver;
'controller_worker/compute_driver' : value => $compute_driver;
'controller_worker/network_driver' : value => $network_driver;
'controller_worker/amp_ssh_key_name' : value => $amp_ssh_key_name;
'haproxy_amphora/key_path' : value => $key_path;
}
}

5
releasenotes/notes/ssh-cert-files-42b8a31092405454.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Adds `amp_ssh_key_name`, `key_path` configuration options for configuring
secure communications with amphorae.

6
spec/classes/octavia_worker_spec.rb
View File

@ -32,6 +32,8 @@ describe 'octavia::worker' do
:amp_secgroup_list => ['lb-mgmt-sec-grp'],
:amp_boot_network_list => ['lbnet1', 'lbnet2'],
:loadbalancer_topology => 'SINGLE',
:amp_ssh_key_name => 'custom-amphora-key',
:key_path => '/opt/octavia/ssh/amphora_key',
})
end
@ -40,6 +42,8 @@ describe 'octavia::worker' do
it { is_expected.to contain_octavia_config('controller_worker/amp_secgroup_list').with_value(['lb-mgmt-sec-grp']) }
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') }
end
it 'configures worker parameters' do
@ -47,6 +51,8 @@ describe 'octavia::worker' do
is_expected.to contain_octavia_config('controller_worker/amphora_driver').with_value('amphora_haproxy_rest_driver')
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')
end
it 'deploys nova flavor for octavia worker' do