|
|
|
@ -124,10 +124,6 @@
|
|
|
|
|
# (Optional) Password for decrypting ssl_key_file (if encrypted) |
|
|
|
|
# Defaults to $::os_service_default. |
|
|
|
|
# |
|
|
|
|
# [*amqp_allow_insecure_clients*] |
|
|
|
|
# (Optional) Accept clients using either SSL or plain TCP |
|
|
|
|
# Defaults to $::os_service_default. |
|
|
|
|
# |
|
|
|
|
# [*amqp_sasl_mechanisms*] |
|
|
|
|
# (Optional) Space separated list of acceptable SASL mechanisms |
|
|
|
|
# Defaults to $::os_service_default. |
|
|
|
@ -263,6 +259,10 @@
|
|
|
|
|
# Defaults to $::os_service_default. |
|
|
|
|
# Deprecated, use fetcher_backend instead |
|
|
|
|
# |
|
|
|
|
# [*amqp_allow_insecure_clients*] |
|
|
|
|
# (Optional) Accept clients using either SSL or plain TCP |
|
|
|
|
# Defaults to undef. |
|
|
|
|
# |
|
|
|
|
class cloudkitty( |
|
|
|
|
$package_ensure = 'present', |
|
|
|
|
$rabbit_use_ssl = $::os_service_default, |
|
|
|
@ -288,7 +288,6 @@ class cloudkitty(
|
|
|
|
|
$amqp_ssl_cert_file = $::os_service_default, |
|
|
|
|
$amqp_ssl_key_file = $::os_service_default, |
|
|
|
|
$amqp_ssl_key_password = $::os_service_default, |
|
|
|
|
$amqp_allow_insecure_clients = $::os_service_default, |
|
|
|
|
$amqp_sasl_mechanisms = $::os_service_default, |
|
|
|
|
$amqp_sasl_config_dir = $::os_service_default, |
|
|
|
|
$amqp_sasl_config_name = $::os_service_default, |
|
|
|
@ -317,12 +316,18 @@ class cloudkitty(
|
|
|
|
|
Optional[Hash] $metrics_config = undef, |
|
|
|
|
# DEPRECATED PARAMETERS |
|
|
|
|
$tenant_fetcher_backend = undef, |
|
|
|
|
$amqp_allow_insecure_clients = undef, |
|
|
|
|
) { |
|
|
|
|
|
|
|
|
|
if $tenant_fetcher_backend != undef { |
|
|
|
|
warning('The parameter cloudkitty::tenant_fetcher_backend was deprecated and has no effect. Use fetcher_backend instead.') |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if $amqp_allow_insecure_clients != undef { |
|
|
|
|
warning('The amqp_allow_insecure_clients parameter is deprecated and \ |
|
|
|
|
will be removed in a future release.') |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
include cloudkitty::params |
|
|
|
|
include cloudkitty::db |
|
|
|
|
include cloudkitty::deps |
|
|
|
@ -355,22 +360,21 @@ class cloudkitty(
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
oslo::messaging::amqp { 'cloudkitty_config': |
|
|
|
|
server_request_prefix => $amqp_server_request_prefix, |
|
|
|
|
broadcast_prefix => $amqp_broadcast_prefix, |
|
|
|
|
group_request_prefix => $amqp_group_request_prefix, |
|
|
|
|
container_name => $amqp_container_name, |
|
|
|
|
idle_timeout => $amqp_idle_timeout, |
|
|
|
|
trace => $amqp_trace, |
|
|
|
|
ssl_ca_file => $amqp_ssl_ca_file, |
|
|
|
|
ssl_cert_file => $amqp_ssl_cert_file, |
|
|
|
|
ssl_key_file => $amqp_ssl_key_file, |
|
|
|
|
ssl_key_password => $amqp_ssl_key_password, |
|
|
|
|
allow_insecure_clients => $amqp_allow_insecure_clients, |
|
|
|
|
sasl_mechanisms => $amqp_sasl_mechanisms, |
|
|
|
|
sasl_config_dir => $amqp_sasl_config_dir, |
|
|
|
|
sasl_config_name => $amqp_sasl_config_name, |
|
|
|
|
username => $amqp_username, |
|
|
|
|
password => $amqp_password, |
|
|
|
|
server_request_prefix => $amqp_server_request_prefix, |
|
|
|
|
broadcast_prefix => $amqp_broadcast_prefix, |
|
|
|
|
group_request_prefix => $amqp_group_request_prefix, |
|
|
|
|
container_name => $amqp_container_name, |
|
|
|
|
idle_timeout => $amqp_idle_timeout, |
|
|
|
|
trace => $amqp_trace, |
|
|
|
|
ssl_ca_file => $amqp_ssl_ca_file, |
|
|
|
|
ssl_cert_file => $amqp_ssl_cert_file, |
|
|
|
|
ssl_key_file => $amqp_ssl_key_file, |
|
|
|
|
ssl_key_password => $amqp_ssl_key_password, |
|
|
|
|
sasl_mechanisms => $amqp_sasl_mechanisms, |
|
|
|
|
sasl_config_dir => $amqp_sasl_config_dir, |
|
|
|
|
sasl_config_name => $amqp_sasl_config_name, |
|
|
|
|
username => $amqp_username, |
|
|
|
|
password => $amqp_password, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
oslo::messaging::default { 'cloudkitty_config': |
|
|
|
|