Merge "Designate/Neutron communicaton failure"
This commit is contained in:
commit
22d89666f5
|
@ -118,6 +118,10 @@
|
|||
# (optional) Whether to use durable queues in AMQP.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*neutron_endpoint_type*]
|
||||
# (optional) Endpoint type to use.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# DEPRECATED PARAMETER
|
||||
#
|
||||
# [*rabbit_virtualhost*]
|
||||
|
@ -179,6 +183,7 @@ class designate(
|
|||
$notification_topics = 'notifications',
|
||||
$purge_config = false,
|
||||
$amqp_durable_queues = $::os_service_default,
|
||||
$neutron_endpoint_type = $::os_service_default,
|
||||
#DEPRECATED PARAMETER
|
||||
$rabbit_virtualhost = undef,
|
||||
$rabbit_host = $::os_service_default,
|
||||
|
@ -288,8 +293,9 @@ to your desired configuration.")
|
|||
|
||||
# default setting
|
||||
designate_config {
|
||||
'DEFAULT/root_helper' : value => $root_helper;
|
||||
'DEFAULT/state_path' : value => $::designate::params::state_path;
|
||||
'DEFAULT/root_helper' : value => $root_helper;
|
||||
'DEFAULT/state_path' : value => $::designate::params::state_path;
|
||||
'network_api:neutron/endpoint_type' : value => $neutron_endpoint_type;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
features:
|
||||
- Add new parameter "network_endpoint_type", to configure endpoint
|
||||
type to use.
|
|
@ -7,10 +7,11 @@ describe 'designate' do
|
|||
|
||||
let :params do
|
||||
{
|
||||
:package_ensure => 'installed',
|
||||
:debug => 'False',
|
||||
:purge_config => false,
|
||||
:root_helper => 'sudo designate-rootwrap /etc/designate/rootwrap.conf'
|
||||
:package_ensure => 'installed',
|
||||
:debug => 'False',
|
||||
:purge_config => false,
|
||||
:neutron_endpoint_type => 'internalURL',
|
||||
:root_helper => 'sudo designate-rootwrap /etc/designate/rootwrap.conf'
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -138,6 +139,10 @@ describe 'designate' do
|
|||
is_expected.to contain_designate_config('DEFAULT/root_helper').with_value( params[:root_helper] )
|
||||
end
|
||||
|
||||
it 'configures network endpoint type to use' do
|
||||
is_expected.to contain_designate_config('network_api:neutron/endpoint_type').with_value( params[:neutron_endpoint_type] )
|
||||
end
|
||||
|
||||
it 'configures notification' do
|
||||
is_expected.to contain_designate_config('oslo_messaging_notifications/driver').with_value('messaging' )
|
||||
is_expected.to contain_designate_config('oslo_messaging_notifications/topics').with_value('notifications')
|
||||
|
|
Loading…
Reference in New Issue