diff --git a/manifests/api.pp b/manifests/api.pp index 57c40cb7..85822e6e 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -210,7 +210,6 @@ class trove::api( 'DEFAULT/nova_proxy_admin_pass': value => $::trove::nova_proxy_admin_pass; 'DEFAULT/nova_proxy_admin_tenant_name': value => $::trove::nova_proxy_admin_tenant_name; 'DEFAULT/control_exchange': value => $::trove::control_exchange; - 'DEFAULT/rpc_backend': value => $::trove::rpc_backend; } if $identity_uri { @@ -339,75 +338,31 @@ class trove::api( 'DEFAULT/heat_service_type': value => $::trove::heat_service_type; } - trove_config { - 'DEFAULT/notification_driver': value => join(any2array($::trove::notification_driver, ',')); - 'DEFAULT/notification_topics': value => $::trove::notification_topics; + oslo::messaging::notifications { 'trove_config': + driver => $::trove::notification_driver, + topics => $::trove::notification_topics } if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_kombu' or $::trove::rpc_backend == 'rabbit' { - if ! $::trove::rabbit_password { - fail('When rpc_backend is rabbitmq, you must set rabbit password') + oslo::messaging::rabbit {'trove_config': + rabbit_hosts => $::trove::rabbit_hosts, + rabbit_host => $::trove::rabbit_host, + rabbit_port => $::trove::rabbit_port, + rabbit_ha_queues => $::trove::rabbit_ha_queues, + rabbit_userid => $::trove::rabbit_userid, + rabbit_password => $::trove::rabbit_password, + rabbit_virtual_host => $::trove::rabbit_virtual_host, + rabbit_use_ssl => $::trove::rabbit_use_ssl, + kombu_reconnect_delay => $::trove::kombu_reconnect_delay, + amqp_durable_queues => $::trove::amqp_durable_queues, + kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs, + kombu_ssl_certfile => $::trove::kombu_ssl_certfile, + kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile, + kombu_ssl_version => $::trove::kombu_ssl_version } - if $::trove::rabbit_hosts { - trove_config { 'oslo_messaging_rabbit/rabbit_hosts': value => join($::trove::rabbit_hosts, ',') } - } else { - trove_config { 'oslo_messaging_rabbit/rabbit_host': value => $::trove::rabbit_host } - trove_config { 'oslo_messaging_rabbit/rabbit_port': value => $::trove::rabbit_port } - trove_config { 'oslo_messaging_rabbit/rabbit_hosts': value => "${::trove::rabbit_host}:${::trove::rabbit_port}" } - } - - if $::trove::rabbit_ha_queues == undef { - if size($::trove::rabbit_hosts) > 1 { - trove_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => true } - } else { - trove_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => false } - } - } else { - trove_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => $::trove::rabbit_ha_queues } - } - + } else { trove_config { - 'oslo_messaging_rabbit/rabbit_userid': value => $::trove::rabbit_userid; - 'oslo_messaging_rabbit/rabbit_password': value => $::trove::rabbit_password, secret => true; - 'oslo_messaging_rabbit/rabbit_virtual_host': value => $::trove::rabbit_virtual_host; - 'oslo_messaging_rabbit/rabbit_use_ssl': value => $::trove::rabbit_use_ssl; - 'oslo_messaging_rabbit/kombu_reconnect_delay': value => $::trove::kombu_reconnect_delay; - 'oslo_messaging_rabbit/amqp_durable_queues': value => $::trove::amqp_durable_queues; - } - - if $::trove::rabbit_use_ssl { - - if $::trove::kombu_ssl_ca_certs { - trove_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': value => $::trove::kombu_ssl_ca_certs; } - } else { - trove_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; } - } - - if $::trove::kombu_ssl_certfile or $::trove::kombu_ssl_keyfile { - trove_config { - 'oslo_messaging_rabbit/kombu_ssl_certfile': value => $::trove::kombu_ssl_certfile; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': value => $::trove::kombu_ssl_keyfile; - } - } else { - trove_config { - 'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': ensure => absent; - } - } - - if $::trove::kombu_ssl_version { - trove_config { 'oslo_messaging_rabbit/kombu_ssl_version': value => $::trove::kombu_ssl_version; } - } else { - trove_config { 'oslo_messaging_rabbit/kombu_ssl_version': ensure => absent; } - } - - } else { - trove_config { - 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_version': ensure => absent; - } + 'DEFAULT/rpc_backend' : value => $::trove::rpc_backend; } } diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 769eb773..905e84cc 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -108,7 +108,6 @@ class trove::conductor( 'DEFAULT/nova_proxy_admin_tenant_name': value => $::trove::nova_proxy_admin_tenant_name; 'DEFAULT/nova_proxy_admin_pass': value => $::trove::nova_proxy_admin_pass; 'DEFAULT/control_exchange': value => $::trove::control_exchange; - 'DEFAULT/rpc_backend': value => $::trove::rpc_backend; 'DEFAULT/trove_conductor_workers': value => $workers; } # profiler config @@ -117,70 +116,31 @@ class trove::conductor( 'profiler/trace_sqlalchemy': value => $trace_sqlalchemy; } + oslo::messaging::notifications { 'trove_conductor_config': + driver => $::trove::notification_driver, + topics => $::trove::notification_topics + } + if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_kombu' or $::trove::rpc_backend == 'rabbit' { - if ! $::trove::rabbit_password { - fail('When rpc_backend is rabbitmq, you must set rabbit password') + oslo::messaging::rabbit {'trove_conductor_config': + rabbit_hosts => $::trove::rabbit_hosts, + rabbit_host => $::trove::rabbit_host, + rabbit_port => $::trove::rabbit_port, + rabbit_ha_queues => $::trove::rabbit_ha_queues, + rabbit_userid => $::trove::rabbit_userid, + rabbit_password => $::trove::rabbit_password, + rabbit_virtual_host => $::trove::rabbit_virtual_host, + rabbit_use_ssl => $::trove::rabbit_use_ssl, + kombu_reconnect_delay => $::trove::kombu_reconnect_delay, + amqp_durable_queues => $::trove::amqp_durable_queues, + kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs, + kombu_ssl_certfile => $::trove::kombu_ssl_certfile, + kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile, + kombu_ssl_version => $::trove::kombu_ssl_version } - if $::trove::rabbit_hosts { - trove_conductor_config { 'oslo_messaging_rabbit/rabbit_hosts': value => join($::trove::rabbit_hosts, ',') } - } else { - trove_conductor_config { 'oslo_messaging_rabbit/rabbit_host': value => $::trove::rabbit_host } - trove_conductor_config { 'oslo_messaging_rabbit/rabbit_port': value => $::trove::rabbit_port } - trove_conductor_config { 'oslo_messaging_rabbit/rabbit_hosts': value => "${::trove::rabbit_host}:${::trove::rabbit_port}" } - } - - if $::trove::rabbit_ha_queues == undef { - if size($::trove::rabbit_hosts) > 1 { - trove_conductor_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => true } - } else { - trove_conductor_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => false } - } - } else { - trove_conductor_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => $::trove::rabbit_ha_queues } - } - + } else { trove_conductor_config { - 'oslo_messaging_rabbit/rabbit_userid': value => $::trove::rabbit_userid; - 'oslo_messaging_rabbit/rabbit_password': value => $::trove::rabbit_password, secret => true; - 'oslo_messaging_rabbit/rabbit_virtual_host': value => $::trove::rabbit_virtual_host; - 'oslo_messaging_rabbit/rabbit_use_ssl': value => $::trove::rabbit_use_ssl; - 'oslo_messaging_rabbit/kombu_reconnect_delay': value => $::trove::kombu_reconnect_delay; - 'oslo_messaging_rabbit/amqp_durable_queues': value => $::trove::amqp_durable_queues; - } - - if $::trove::rabbit_use_ssl { - - if $::trove::kombu_ssl_ca_certs { - trove_conductor_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': value => $::trove::kombu_ssl_ca_certs; } - } else { - trove_conductor_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; } - } - - if $::trove::kombu_ssl_certfile or $::trove::kombu_ssl_keyfile { - trove_conductor_config { - 'oslo_messaging_rabbit/kombu_ssl_certfile': value => $::trove::kombu_ssl_certfile; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': value => $::trove::kombu_ssl_keyfile; - } - } else { - trove_conductor_config { - 'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': ensure => absent; - } - } - - if $::trove::kombu_ssl_version { - trove_conductor_config { 'oslo_messaging_rabbit/kombu_ssl_version': value => $::trove::kombu_ssl_version; } - } else { - trove_conductor_config { 'oslo_messaging_rabbit/kombu_ssl_version': ensure => absent; } - } - - } else { - trove_conductor_config { - 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_version': ensure => absent; - } + 'DEFAULT/rpc_backend' : value => $::trove::rpc_backend } } diff --git a/manifests/guestagent.pp b/manifests/guestagent.pp index e9c860b8..342e5b50 100644 --- a/manifests/guestagent.pp +++ b/manifests/guestagent.pp @@ -79,7 +79,6 @@ class trove::guestagent( 'DEFAULT/trove_auth_url': value => $auth_url; 'DEFAULT/swift_url': value => $swift_url; 'DEFAULT/control_exchange': value => $control_exchange; - 'DEFAULT/rpc_backend': value => $::trove::rpc_backend; } # region name @@ -90,75 +89,31 @@ class trove::guestagent( trove_guestagent_config { 'DEFAULT/os_region_name': ensure => absent } } - trove_guestagent_config { - 'DEFAULT/notification_driver': value => join(any2array($::trove::notification_driver, ',')); - 'DEFAULT/notification_topics': value => $::trove::notification_topics; + oslo::messaging::notifications { 'trove_guestagent_config': + driver => $::trove::notification_driver, + topics => $::trove::notification_topics } if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_kombu' or $::trove::rpc_backend == 'rabbit' { - if ! $::trove::rabbit_password { - fail('When rpc_backend is rabbitmq, you must set rabbit password') + oslo::messaging::rabbit {'trove_guestagent_config': + rabbit_hosts => $::trove::rabbit_hosts, + rabbit_host => $::trove::rabbit_host, + rabbit_port => $::trove::rabbit_port, + rabbit_ha_queues => $::trove::rabbit_ha_queues, + rabbit_userid => $::trove::rabbit_userid, + rabbit_password => $::trove::rabbit_password, + rabbit_virtual_host => $::trove::rabbit_virtual_host, + rabbit_use_ssl => $::trove::rabbit_use_ssl, + kombu_reconnect_delay => $::trove::kombu_reconnect_delay, + amqp_durable_queues => $::trove::amqp_durable_queues, + kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs, + kombu_ssl_certfile => $::trove::kombu_ssl_certfile, + kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile, + kombu_ssl_version => $::trove::kombu_ssl_version } - if $::trove::rabbit_hosts { - trove_guestagent_config { 'oslo_messaging_rabbit/rabbit_hosts': value => join($::trove::rabbit_hosts, ',') } - } else { - trove_guestagent_config { 'oslo_messaging_rabbit/rabbit_host': value => $::trove::rabbit_host } - trove_guestagent_config { 'oslo_messaging_rabbit/rabbit_port': value => $::trove::rabbit_port } - trove_guestagent_config { 'oslo_messaging_rabbit/rabbit_hosts': value => "${::trove::rabbit_host}:${::trove::rabbit_port}" } - } - - if $::trove::rabbit_ha_queues == undef { - if size($::trove::rabbit_hosts) > 1 { - trove_guestagent_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => true } - } else { - trove_guestagent_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => false } - } - } else { - trove_guestagent_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => $::trove::rabbit_ha_queues } - } - + } else { trove_guestagent_config { - 'oslo_messaging_rabbit/rabbit_userid': value => $::trove::rabbit_userid; - 'oslo_messaging_rabbit/rabbit_password': value => $::trove::rabbit_password, secret => true; - 'oslo_messaging_rabbit/rabbit_virtual_host': value => $::trove::rabbit_virtual_host; - 'oslo_messaging_rabbit/rabbit_use_ssl': value => $::trove::rabbit_use_ssl; - 'oslo_messaging_rabbit/kombu_reconnect_delay': value => $::trove::kombu_reconnect_delay; - 'oslo_messaging_rabbit/amqp_durable_queues': value => $::trove::amqp_durable_queues; - } - - if $::trove::rabbit_use_ssl { - - if $::trove::kombu_ssl_ca_certs { - trove_guestagent_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': value => $::trove::kombu_ssl_ca_certs; } - } else { - trove_guestagent_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; } - } - - if $::trove::kombu_ssl_certfile or $::trove::kombu_ssl_keyfile { - trove_guestagent_config { - 'oslo_messaging_rabbit/kombu_ssl_certfile': value => $::trove::kombu_ssl_certfile; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': value => $::trove::kombu_ssl_keyfile; - } - } else { - trove_guestagent_config { - 'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': ensure => absent; - } - } - - if $::trove::kombu_ssl_version { - trove_guestagent_config { 'oslo_messaging_rabbit/kombu_ssl_version': value => $::trove::kombu_ssl_version; } - } else { - trove_guestagent_config { 'oslo_messaging_rabbit/kombu_ssl_version': ensure => absent; } - } - - } else { - trove_guestagent_config { - 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_version': ensure => absent; - } + 'DEFAULT/rpc_backend' : value => $::trove::rpc_backend } } diff --git a/manifests/init.pp b/manifests/init.pp index ee49f56a..a2461b1f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -23,71 +23,71 @@ # [*notification_driver*] # (optional) Driver or drivers to handle sending notifications. # Value can be a string or a list. -# Defaults to noop +# Defaults to $::os_service_default # # [*notification_topics*] # (optional) AMQP topic used for OpenStack notifications -# Defaults to 'notifications' +# Defaults to $::os_service_default # # [*rabbit_host*] # (optional) Location of rabbitmq installation. # Note that, for security reasons, this rabbitmq host should not be the # same that the core openstack services are using for communication. See # http://lists.openstack.org/pipermail/openstack-dev/2015-April/061759.html -# Defaults to 'localhost' +# Defaults to $::os_service_default # # [*rabbit_hosts*] # (optional) List of clustered rabbit servers. # Note that, for security reasons, these rabbitmq hosts should not be the # same that the core openstack services are using for communication. See # http://lists.openstack.org/pipermail/openstack-dev/2015-April/061759.html -# Defaults to false +# Defaults to $::os_service_default # # [*rabbit_port*] # (optional) Port for rabbitmq instance. -# Defaults to '5672' +# Defaults to $::os_service_default # # [*rabbit_password*] # (optional) Password used to connect to rabbitmq. -# Defaults to 'guest' +# Defaults to $::os_service_default # # [*rabbit_userid*] # (optional) User used to connect to rabbitmq. -# Defaults to 'guest' +# Defaults to $::os_service_default # # [*rabbit_virtual_host*] # (optional) The RabbitMQ virtual host. -# Defaults to '/' +# Defaults to $::os_service_default # # [*rabbit_use_ssl*] # (optional) Connect over SSL for RabbitMQ -# Defaults to false +# Defaults to $::os_service_default # # [*rabbit_notification_topic*] # (optional) Notification topic. -# Defaults to false. +# Defaults to $::os_service_default # # [*kombu_ssl_ca_certs*] # (optional) SSL certification authority file (valid only if SSL enabled). -# Defaults to undef +# Defaults to $::os_service_default # # [*kombu_ssl_certfile*] # (optional) SSL cert file (valid only if SSL enabled). -# Defaults to undef +# Defaults to $::os_service_default # # [*kombu_ssl_keyfile*] # (optional) SSL key file (valid only if SSL enabled). -# Defaults to undef +# Defaults to $::os_service_default # # [*kombu_ssl_version*] # (optional) SSL version to use (valid only if SSL enabled). # Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be # available on some distributions. -# Defaults to 'TLSv1' +# Defaults to $::os_service_default # # [*rabbit_ha_queues*] # (optional) Use HA queues in RabbitMQ (x-ha-policy: all). -# Defaults to undef +# Defaults to $::os_service_default # # [*kombu_reconnect_delay*] # (optional) How long to wait before reconnecting in response to an AMQP @@ -96,7 +96,7 @@ # # [*amqp_durable_queues*] # (optional) Define queues as "durable" to rabbitmq. -# Defaults to false +# Defaults to $::os_service_default # # [*rpc_backend*] # (optional) The rpc backend implementation to use, can be: @@ -200,23 +200,23 @@ # class trove( $nova_proxy_admin_pass, - $notification_driver = 'noop', - $notification_topics = 'notifications', - $rabbit_host = 'localhost', - $rabbit_hosts = undef, - $rabbit_password = 'guest', - $rabbit_port = '5672', - $rabbit_userid = 'guest', - $rabbit_virtual_host = '/', - $rabbit_use_ssl = false, - $rabbit_ha_queues = undef, - $rabbit_notification_topic = 'notifications', - $kombu_ssl_ca_certs = undef, - $kombu_ssl_certfile = undef, - $kombu_ssl_keyfile = undef, - $kombu_ssl_version = 'TLSv1', + $notification_driver = $::os_service_default, + $notification_topics = $::os_service_default, + $rabbit_host = $::os_service_default, + $rabbit_hosts = $::os_service_default, + $rabbit_password = $::os_service_default, + $rabbit_port = $::os_service_default, + $rabbit_userid = $::os_service_default, + $rabbit_virtual_host = $::os_service_default, + $rabbit_use_ssl = $::os_service_default, + $rabbit_ha_queues = $::os_service_default, + $rabbit_notification_topic = $::os_service_default, + $kombu_ssl_ca_certs = $::os_service_default, + $kombu_ssl_certfile = $::os_service_default, + $kombu_ssl_keyfile = $::os_service_default, + $kombu_ssl_version = $::os_service_default, $kombu_reconnect_delay = $::os_service_default, - $amqp_durable_queues = false, + $amqp_durable_queues = $::os_service_default, $database_connection = undef, $database_idle_timeout = undef, $database_max_retries = undef, diff --git a/manifests/taskmanager.pp b/manifests/taskmanager.pp index e031ffc1..8a54f67d 100644 --- a/manifests/taskmanager.pp +++ b/manifests/taskmanager.pp @@ -129,7 +129,6 @@ class trove::taskmanager( 'DEFAULT/nova_proxy_admin_user': value => $::trove::nova_proxy_admin_user; 'DEFAULT/nova_proxy_admin_pass': value => $::trove::nova_proxy_admin_pass; 'DEFAULT/nova_proxy_admin_tenant_name': value => $::trove::nova_proxy_admin_tenant_name; - 'DEFAULT/rpc_backend': value => $::trove::rpc_backend; } trove_config { @@ -153,76 +152,31 @@ class trove::taskmanager( 'DEFAULT/heat_service_type': value => $::trove::heat_service_type; } - trove_taskmanager_config { - 'DEFAULT/notification_driver': value => join(any2array($::trove::notification_driver, ',')); - 'DEFAULT/notification_topics': value => $::trove::notification_topics; + oslo::messaging::notifications { 'trove_taskmanager_config': + driver => $::trove::notification_driver, + topics => $::trove::notification_topics } - if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_kombu' or $::trove::rpc_backend == 'rabbit'{ - if ! $::trove::rabbit_password { - fail('When rpc_backend is rabbitmq, you must set rabbit password') + if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_kombu' or $::trove::rpc_backend == 'rabbit' { + oslo::messaging::rabbit { 'trove_taskmanager_config': + rabbit_hosts => $::trove::rabbit_hosts, + rabbit_host => $::trove::rabbit_host, + rabbit_port => $::trove::rabbit_port, + rabbit_ha_queues => $::trove::rabbit_ha_queues, + rabbit_userid => $::trove::rabbit_userid, + rabbit_password => $::trove::rabbit_password, + rabbit_virtual_host => $::trove::rabbit_virtual_host, + rabbit_use_ssl => $::trove::rabbit_use_ssl, + kombu_reconnect_delay => $::trove::kombu_reconnect_delay, + amqp_durable_queues => $::trove::amqp_durable_queues, + kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs, + kombu_ssl_certfile => $::trove::kombu_ssl_certfile, + kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile, + kombu_ssl_version => $::trove::kombu_ssl_version } - if $::trove::rabbit_hosts { - trove_taskmanager_config { 'oslo_messaging_rabbit/rabbit_hosts': value => join($::trove::rabbit_hosts, ',') } - } else { - trove_taskmanager_config { 'oslo_messaging_rabbit/rabbit_host': value => $::trove::rabbit_host } - trove_taskmanager_config { 'oslo_messaging_rabbit/rabbit_port': value => $::trove::rabbit_port } - trove_taskmanager_config { 'oslo_messaging_rabbit/rabbit_hosts': value => "${::trove::rabbit_host}:${::trove::rabbit_port}" } - } - - if $::trove::rabbit_ha_queues == undef { - if size($::trove::rabbit_hosts) > 1 { - $rabbit_ha_queues_real = true - } else { - $rabbit_ha_queues_real = false - } - } else { - $rabbit_ha_queues_real = $::trove::rabbit_ha_queues - } - + } else { trove_taskmanager_config { - 'oslo_messaging_rabbit/rabbit_userid': value => $::trove::rabbit_userid; - 'oslo_messaging_rabbit/rabbit_password': value => $::trove::rabbit_password, secret => true; - 'oslo_messaging_rabbit/rabbit_virtual_host': value => $::trove::rabbit_virtual_host; - 'oslo_messaging_rabbit/rabbit_use_ssl': value => $::trove::rabbit_use_ssl; - 'oslo_messaging_rabbit/kombu_reconnect_delay': value => $::trove::kombu_reconnect_delay; - 'oslo_messaging_rabbit/amqp_durable_queues': value => $::trove::amqp_durable_queues; - 'oslo_messaging_rabbit/rabbit_ha_queues': value => $rabbit_ha_queues_real - } - - if $::trove::rabbit_use_ssl { - - if $::trove::kombu_ssl_ca_certs { - trove_taskmanager_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': value => $::trove::kombu_ssl_ca_certs; } - } else { - trove_taskmanager_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; } - } - - if $::trove::kombu_ssl_certfile or $::trove::kombu_ssl_keyfile { - trove_taskmanager_config { - 'oslo_messaging_rabbit/kombu_ssl_certfile': value => $::trove::kombu_ssl_certfile; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': value => $::trove::kombu_ssl_keyfile; - } - } else { - trove_taskmanager_config { - 'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': ensure => absent; - } - } - - if $::trove::kombu_ssl_version { - trove_taskmanager_config { 'oslo_messaging_rabbit/kombu_ssl_version': value => $::trove::kombu_ssl_version; } - } else { - trove_taskmanager_config { 'oslo_messaging_rabbit/kombu_ssl_version': ensure => absent; } - } - - } else { - trove_taskmanager_config { - 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_keyfile': ensure => absent; - 'oslo_messaging_rabbit/kombu_ssl_version': ensure => absent; - } + 'DEFAULT/rpc_backend' : value => $::trove::rpc_backend } } diff --git a/spec/classes/trove_api_spec.rb b/spec/classes/trove_api_spec.rb index 6a57cdd4..6d026c42 100644 --- a/spec/classes/trove_api_spec.rb +++ b/spec/classes/trove_api_spec.rb @@ -84,13 +84,13 @@ describe 'trove::api' do is_expected.to contain_trove_config('DEFAULT/http_put_rate').with_value('200') is_expected.to contain_trove_config('DEFAULT/http_delete_rate').with_value('200') is_expected.to contain_trove_config('DEFAULT/http_mgmt_post_rate').with_value('200') - is_expected.to contain_trove_config('DEFAULT/notification_driver').with_value('noop,') - is_expected.to contain_trove_config('DEFAULT/notification_topics').with_value('notifications') - is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_userid').with_value('guest') - is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_password').with_value('guest') - is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false) + is_expected.to contain_trove_config('oslo_messaging_notifications/driver').with_value('') + is_expected.to contain_trove_config('oslo_messaging_notifications/topics').with_value('') + is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_userid').with_value('') + is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_password').with_value('') + is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('') is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('') - is_expected.to contain_trove_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false) + is_expected.to contain_trove_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') is_expected.to contain_trove_config('ssl/cert_file').with_ensure('absent') is_expected.to contain_trove_config('ssl/key_file').with_ensure('absent') is_expected.to contain_trove_config('ssl/ca_file').with_ensure('absent') @@ -161,8 +161,8 @@ describe 'trove::api' do end it 'configures trove-api with RabbitMQ' do is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_host').with_value('10.0.0.1') - is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('false') - is_expected.to contain_trove_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('false') + is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') + is_expected.to contain_trove_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') end end @@ -185,6 +185,7 @@ describe 'trove::api' do let :pre_condition do "class { 'trove': nova_proxy_admin_pass => 'verysecrete', + rabbit_ha_queues => 'true', rabbit_hosts => ['10.0.0.1','10.0.0.2']}" end it 'configures trove-api with RabbitMQ' do @@ -224,10 +225,10 @@ describe 'trove::api' do it do is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true') - is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') - is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') - is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') - is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1') + is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('') + is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('') + is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('') + is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('') end end @@ -235,16 +236,15 @@ describe 'trove::api' do let :pre_condition do "class { 'trove': nova_proxy_admin_pass => 'verysecrete', - rabbit_use_ssl => false, - kombu_ssl_version => 'TLSv1'}" + rabbit_use_ssl => false}" end it do is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('false') - is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') - is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') - is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') - is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_version').with_ensure('absent') + is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('') + is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('') + is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('') + is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('') end end diff --git a/spec/classes/trove_conductor_spec.rb b/spec/classes/trove_conductor_spec.rb index 40ee8db9..0dfc2c5c 100644 --- a/spec/classes/trove_conductor_spec.rb +++ b/spec/classes/trove_conductor_spec.rb @@ -31,11 +31,11 @@ describe 'trove::conductor' do is_expected.to contain_trove_conductor_config('DEFAULT/nova_proxy_admin_user').with_value('admin') is_expected.to contain_trove_conductor_config('DEFAULT/nova_proxy_admin_pass').with_value('verysecrete') is_expected.to contain_trove_conductor_config('DEFAULT/nova_proxy_admin_tenant_name').with_value('admin') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_userid').with_value('guest') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_password').with_value('guest') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false) + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_userid').with_value('') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_password').with_value('') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('') is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false) + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') is_expected.to contain_trove_conductor_config('DEFAULT/trove_conductor_workers').with_value('8') is_expected.to contain_trove_conductor_config('profiler/enabled').with_value('') is_expected.to contain_trove_conductor_config('profiler/trace_sqlalchemy').with_value('') @@ -49,8 +49,8 @@ describe 'trove::conductor' do end it 'configures trove-conductor with RabbitMQ' do is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_host').with_value('10.0.0.1') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('false') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('false') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') end end @@ -122,10 +122,10 @@ describe 'trove::conductor' do it do is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('') end end @@ -133,16 +133,15 @@ describe 'trove::conductor' do let :pre_condition do "class { 'trove': nova_proxy_admin_pass => 'verysecrete', - rabbit_use_ssl => false, - kombu_ssl_version => 'TLSv1'}" + rabbit_use_ssl => false}" end it do is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('false') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') - is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_version').with_ensure('absent') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('') + is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('') end end diff --git a/spec/classes/trove_guestagent_spec.rb b/spec/classes/trove_guestagent_spec.rb index b325a479..9eb9fd93 100644 --- a/spec/classes/trove_guestagent_spec.rb +++ b/spec/classes/trove_guestagent_spec.rb @@ -30,13 +30,13 @@ describe 'trove::guestagent' do is_expected.to contain_trove_guestagent_config('DEFAULT/verbose').with_value(false) is_expected.to contain_trove_guestagent_config('DEFAULT/debug').with_value(false) is_expected.to contain_trove_guestagent_config('DEFAULT/os_region_name').with_value('RegionOne') - is_expected.to contain_trove_guestagent_config('DEFAULT/notification_driver').with_value('noop,') - is_expected.to contain_trove_guestagent_config('DEFAULT/notification_topics').with_value('notifications') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_userid').with_value('guest') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_password').with_value('guest') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false) + is_expected.to contain_trove_guestagent_config('oslo_messaging_notifications/driver').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_notifications/topics').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_userid').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_password').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('') is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false) + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') end context 'when using a single RabbitMQ server' do @@ -47,8 +47,8 @@ describe 'trove::guestagent' do end it 'configures trove-guestagent with RabbitMQ' do is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_host').with_value('10.0.0.1') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('false') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('false') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') end end @@ -126,10 +126,10 @@ describe 'trove::guestagent' do it do is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('') end end @@ -137,16 +137,15 @@ describe 'trove::guestagent' do let :pre_condition do "class { 'trove': nova_proxy_admin_pass => 'verysecrete', - rabbit_use_ssl => false, - kombu_ssl_version => 'TLSv1'}" + rabbit_use_ssl => false}" end it do is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('false') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') - is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_version').with_ensure('absent') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('') + is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('') end end diff --git a/spec/classes/trove_taskmanager_spec.rb b/spec/classes/trove_taskmanager_spec.rb index 2508b49f..f2625f55 100644 --- a/spec/classes/trove_taskmanager_spec.rb +++ b/spec/classes/trove_taskmanager_spec.rb @@ -66,13 +66,13 @@ describe 'trove::taskmanager' do is_expected.to contain_trove_taskmanager_config('DEFAULT/neutron_service_type').with_value('network') is_expected.to contain_trove_config('DEFAULT/taskmanager_queue').with_value('taskmanager') is_expected.to contain_file('/etc/trove/trove-guestagent.conf') - is_expected.to contain_trove_taskmanager_config('DEFAULT/notification_driver').with_value('noop,') - is_expected.to contain_trove_taskmanager_config('DEFAULT/notification_topics').with_value('notifications') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_userid').with_value('guest') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_password').with_value('guest') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false) + is_expected.to contain_trove_taskmanager_config('oslo_messaging_notifications/driver').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_notifications/topics').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_userid').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_password').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('') is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false) + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') end context 'when set use_guestagent_template to false' do @@ -98,13 +98,13 @@ describe 'trove::taskmanager' do end it 'configures trove-taskmanager with RabbitMQ' do is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_host').with_value('10.0.0.1') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('false') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('false') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') # trove taskmanager also configures trove_guestagent.conf by default, ensure rabbit is right there is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^rabbit_host=10.0.0.1$/) - is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^rabbit_port=5672$/) - is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^rabbit_ha_queues=false$/) + is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^#rabbit_port=5672$/) + is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^#rabbit_ha_queues=false$/) end end @@ -123,7 +123,7 @@ describe 'trove::taskmanager' do # trove taskmanager also configures trove_guestagent.conf by default, ensure rabbit is right there is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^rabbit_host=10.0.0.1$/) - is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^rabbit_port=5672$/) + is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^#rabbit_port=5672$/) is_expected.to contain_file('/etc/trove/trove-guestagent.conf').with_content(/^rabbit_ha_queues=true$/) end end @@ -230,10 +230,10 @@ describe 'trove::taskmanager' do it do is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('') end end @@ -241,16 +241,15 @@ describe 'trove::taskmanager' do let :pre_condition do "class { 'trove': nova_proxy_admin_pass => 'verysecrete', - rabbit_use_ssl => false, - kombu_ssl_version => 'TLSv1'}" + rabbit_use_ssl => false}" end it do is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('false') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') - is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_version').with_ensure('absent') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('') + is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('') end end diff --git a/templates/trove-guestagent.conf.erb b/templates/trove-guestagent.conf.erb index 32fd8fad..429dd761 100644 --- a/templates/trove-guestagent.conf.erb +++ b/templates/trove-guestagent.conf.erb @@ -78,7 +78,7 @@ backup_segment_max_size = 2147483648 [oslo_messaging_rabbit] # ============ RabbitMQ connection options ======================== -<%- if @rabbit_hosts -%> +<%- if @rabbit_hosts and @rabbit_hosts != "" -%> # RabbitMQ HA cluster host:port pairs. (list value) rabbit_hosts=<%= @rabbit_hosts.join(',') %> @@ -92,23 +92,51 @@ rabbit_hosts=<%= @rabbit_hosts.join(',') %> <%- else -%> # The RabbitMQ broker address where a single node is used. # (string value) +<%- if @rabbit_host and @rabbit_host != "" -%> rabbit_host=<%= @rabbit_host %> +<%- else -%> +#rabbit_host=localhost +<%- end -%> # The RabbitMQ broker port where a single node is used. # (integer value) +<%- if @rabbit_port and @rabbit_port != "" -%> rabbit_port=<%= @rabbit_port %> +<%- else -%> +#rabbit_port=5672 +<%- end -%> <%- end -%> # The RabbitMQ userid. (string value) +<%- if @rabbit_userid and @rabbit_userid != "" -%> rabbit_userid=<%= @rabbit_userid %> +<%- else -%> +#rabbit_userid=guest +<%- end -%> # The RabbitMQ password. (string value) +<%- if @rabbit_password and @rabbit_password != "" -%> rabbit_password=<%= @rabbit_password %> +<%- else -%> +#rabbit_password=guest +<%- end -%> # The RabbitMQ virtual host. (string value) +<%- if @rabbit_virtual_host and @rabbit_virtual_host != "" -%> rabbit_virtual_host=<%= @rabbit_virtual_host %> +<%- else -%> +#rabbit_virtual_host=/ +<%- end -%> -rabbit_ha_queues=<%= @rabbit_ha_queues_real %> +<%- if @rabbit_ha_queues and @rabbit_ha_queues != "" -%> +rabbit_ha_queues=<%= @rabbit_ha_queues %> +<%- else -%> +<%- if @rabbit_hosts and @rabbit_hosts != "" -%> +rabbit_ha_queues=true +<%- else -%> +#rabbit_ha_queues=false +<%- end -%> +<%- end -%> # ========== Datastore Specific Configuration Options ==========