Merge "Introduce support for oslo.messaging amqp driver configuration"

diff --cc manifests/init.pp
index e06c397c4d0d02b2271d08bc1e6e4c619f119bf0,d8e0a7a1b56393eb5454fb4a241bcea048e1b108..7c9b3940f9d9e3d6ddd47b13660de64e89b163c9
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -140,15 -140,75 +140,79 @@@
  #   (string value)
  #   Defaults to $::os_service_default
  #
 -#  [*memcached_servers*]
 -#    (Optional) A list of memcached server(s) to use for caching. (list value)
 -#    Defaults to $::os_service_default
 +# [*memcached_servers*]
 +#   (Optional) A list of memcached server(s) to use for caching. (list value)
 +#   Defaults to $::os_service_default
  #
+ # [*amqp_server_request_prefix*]
+ #   (Optional) Address prefix used when sending to a specific server
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_broadcast_prefix*]
+ #   (Optional) address prefix used when broadcasting to all servers
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_group_request_prefix*]
+ #   (Optional) address prefix when sending to any server in group
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_container_name*]
+ #   (Optional) Name for the AMQP container
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_idle_timeout*]
+ #   (Optional) Timeout for inactive connections
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_trace*]
+ #   (Optional) Debug: dump AMQP frames to stdout
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_ssl_ca_file*]
+ #   (Optional) CA certificate PEM file to verify server certificate
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_ssl_cert_file*]
+ #   (Optional) Identifying certificate PEM file to present to clients
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_ssl_key_file*]
+ #   (Optional) Private key PEM file used to sign cert_file certificate
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_ssl_key_password*]
+ #   (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.
+ #
+ # [*amqp_sasl_config_dir*]
+ #   (Optional) Path to directory that contains the SASL configuration
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_sasl_config_name*]
+ #   (Optional) Name of configuration file (without .conf suffix)
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_username*]
+ #   (Optional) User name for message broker authentication
+ #   Defaults to $::os_service_default.
+ #
+ # [*amqp_password*]
+ #   (Optional) Password for message broker authentication
+ #   Defaults to $::os_service_default.
+ #
  # === DEPRECATED PARAMETERS:
 +#  [*metering_secret*]
 +#   (optional)  Secret key for signing messages.
 +#   This option has been renamed to telemetry_secret in Mitaka.
 +#   Don't define this if using telemetry_secret.
  #
  # [*alarm_history_time_to_live*]
  #
@@@ -184,11 -244,28 +248,27 @@@ class ceilometer
    $kombu_reconnect_delay              = $::os_service_default,
    $kombu_compression                  = $::os_service_default,
    $memcached_servers                  = $::os_service_default,
+   $amqp_server_request_prefix         = $::os_service_default,
+   $amqp_broadcast_prefix              = $::os_service_default,
+   $amqp_group_request_prefix          = $::os_service_default,
+   $amqp_container_name                = $::os_service_default,
+   $amqp_idle_timeout                  = $::os_service_default,
+   $amqp_trace                         = $::os_service_default,
+   $amqp_ssl_ca_file                   = $::os_service_default,
+   $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,
+   $amqp_username                      = $::os_service_default,
+   $amqp_password                      = $::os_service_default,
    # DEPRECATED PARAMETERS
    $alarm_history_time_to_live         = undef,
 +  $metering_secret                    = undef,
  ) {
  
 -  validate_string($metering_secret)
 -
    include ::ceilometer::logging
    include ::ceilometer::params
  

diff --cc spec/classes/ceilometer_init_spec.rb
Simple merge