Merge "Add support for [controller_worker] event_notifications"
This commit is contained in:
commit
b9dd33b2b5
|
@ -78,6 +78,10 @@
|
||||||
# (optional) Time, in seconds, between amphora delete retries.
|
# (optional) Time, in seconds, between amphora delete retries.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
|
# [*event_notifications*]
|
||||||
|
# (optional) Enable octavia event notifications.
|
||||||
|
# Defaults to $facts['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'
|
||||||
|
@ -269,6 +273,7 @@ class octavia::controller (
|
||||||
$amp_timezone = $facts['os_service_default'],
|
$amp_timezone = $facts['os_service_default'],
|
||||||
$amphora_delete_retries = $facts['os_service_default'],
|
$amphora_delete_retries = $facts['os_service_default'],
|
||||||
$amphora_delete_retry_interval = $facts['os_service_default'],
|
$amphora_delete_retry_interval = $facts['os_service_default'],
|
||||||
|
$event_notifications = $facts['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 = $facts['os_service_default'],
|
$timeout_client_data = $facts['os_service_default'],
|
||||||
|
@ -344,6 +349,7 @@ class octavia::controller (
|
||||||
'controller_worker/amp_timezone' : value => $amp_timezone;
|
'controller_worker/amp_timezone' : value => $amp_timezone;
|
||||||
'controller_worker/amphora_delete_retries' : value => $amphora_delete_retries;
|
'controller_worker/amphora_delete_retries' : value => $amphora_delete_retries;
|
||||||
'controller_worker/amphora_delete_retry_interval' : value => $amphora_delete_retry_interval;
|
'controller_worker/amphora_delete_retry_interval' : value => $amphora_delete_retry_interval;
|
||||||
|
'controller_worker/event_notifications' : value => $event_notifications;
|
||||||
'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;
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``octavia::controller::event_notifications`` parameter has been
|
||||||
|
added.
|
|
@ -37,6 +37,7 @@ describe 'octavia::controller' do
|
||||||
:amp_timezone => 'UTC',
|
:amp_timezone => 'UTC',
|
||||||
:amphora_delete_retries => 5,
|
:amphora_delete_retries => 5,
|
||||||
:amphora_delete_retry_interval => 5,
|
:amphora_delete_retry_interval => 5,
|
||||||
|
:event_notifications => true,
|
||||||
:timeout_client_data => 60,
|
:timeout_client_data => 60,
|
||||||
:timeout_member_connect => 5,
|
:timeout_member_connect => 5,
|
||||||
:timeout_member_data => 60,
|
:timeout_member_data => 60,
|
||||||
|
@ -94,6 +95,7 @@ describe 'octavia::controller' do
|
||||||
is_expected.to contain_octavia_config('controller_worker/amp_timezone').with_value('UTC')
|
is_expected.to contain_octavia_config('controller_worker/amp_timezone').with_value('UTC')
|
||||||
is_expected.to contain_octavia_config('controller_worker/amphora_delete_retries').with_value(5)
|
is_expected.to contain_octavia_config('controller_worker/amphora_delete_retries').with_value(5)
|
||||||
is_expected.to contain_octavia_config('controller_worker/amphora_delete_retry_interval').with_value(5)
|
is_expected.to contain_octavia_config('controller_worker/amphora_delete_retry_interval').with_value(5)
|
||||||
|
is_expected.to contain_octavia_config('controller_worker/event_notifications').with_value(true)
|
||||||
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)
|
||||||
is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value(60)
|
is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value(60)
|
||||||
|
@ -156,6 +158,7 @@ describe 'octavia::controller' do
|
||||||
is_expected.to contain_octavia_config('controller_worker/amp_timezone').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_octavia_config('controller_worker/amp_timezone').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_octavia_config('controller_worker/amphora_delete_retries').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_octavia_config('controller_worker/amphora_delete_retries').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_octavia_config('controller_worker/amphora_delete_retry_interval').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_octavia_config('controller_worker/amphora_delete_retry_interval').with_value('<SERVICE DEFAULT>')
|
||||||
|
is_expected.to contain_octavia_config('controller_worker/event_notifications').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_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>')
|
||||||
is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value('<SERVICE DEFAULT>')
|
||||||
|
|
Loading…
Reference in New Issue