Merge "Remove support for amqp1 messaging driver"

manifests/init.pp

@@ -144,66 +144,6 @@
 #   Use durable queues in amqp.
 #   (Optional) Defaults to $facts['os_service_default']
 #
-# [*amqp_server_request_prefix*]
-#   (Optional) Address prefix used when sending to a specific server
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_broadcast_prefix*]
-#   (Optional) address prefix used when broadcasting to all servers
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_group_request_prefix*]
-#   (Optional) address prefix when sending to any server in group
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_container_name*]
-#   (Optional) Name for the AMQP container
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_idle_timeout*]
-#   (Optional) Timeout for inactive connections
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_trace*]
-#   (Optional) Debug: dump AMQP frames to stdout
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_ssl_ca_file*]
-#   (Optional) CA certificate PEM file to verify server certificate
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_ssl_cert_file*]
-#   (Optional) Identifying certificate PEM file to present to clients
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_ssl_key_file*]
-#   (Optional) Private key PEM file used to sign cert_file certificate
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_ssl_key_password*]
-#   (Optional) Password for decrypting ssl_key_file (if encrypted)
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_sasl_mechanisms*]
-#   (Optional) Space separated list of acceptable SASL mechanisms
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_sasl_config_dir*]
-#   (Optional) Path to directory that contains the SASL configuration
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_sasl_config_name*]
-#   (Optional) Name of configuration file (without .conf suffix)
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_username*]
-#   (Optional) User name for message broker authentication
-#   Defaults to $facts['os_service_default'].
-#
-# [*amqp_password*]
-#   (Optional) Password for message broker authentication
-#   Defaults to $facts['os_service_default'].
-#
 # [*storage_availability_zone*]
 #   (optional) Availability zone of the node.
 #   Defaults to 'nova'
@@ -308,21 +248,6 @@ class cinder (
   $kombu_failover_strategy              = $facts['os_service_default'],
   $kombu_compression                    = $facts['os_service_default'],
   $amqp_durable_queues                  = $facts['os_service_default'],
-  $amqp_server_request_prefix           = $facts['os_service_default'],
-  $amqp_broadcast_prefix                = $facts['os_service_default'],
-  $amqp_group_request_prefix            = $facts['os_service_default'],
-  $amqp_container_name                  = $facts['os_service_default'],
-  $amqp_idle_timeout                    = $facts['os_service_default'],
-  $amqp_trace                           = $facts['os_service_default'],
-  $amqp_ssl_ca_file                     = $facts['os_service_default'],
-  $amqp_ssl_cert_file                   = $facts['os_service_default'],
-  $amqp_ssl_key_file                    = $facts['os_service_default'],
-  $amqp_ssl_key_password                = $facts['os_service_default'],
-  $amqp_sasl_mechanisms                 = $facts['os_service_default'],
-  $amqp_sasl_config_dir                 = $facts['os_service_default'],
-  $amqp_sasl_config_name                = $facts['os_service_default'],
-  $amqp_username                        = $facts['os_service_default'],
-  $amqp_password                        = $facts['os_service_default'],
   $package_ensure                       = 'present',
   $api_paste_config                     = '/etc/cinder/api-paste.ini',
   $storage_availability_zone            = 'nova',
@@ -376,24 +301,6 @@ class cinder (
     rabbit_quorum_max_memory_bytes  => $rabbit_quorum_max_memory_bytes,
   }
 
-  oslo::messaging::amqp { 'cinder_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,
-    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 { 'cinder_config':
     executor_thread_pool_size => $executor_thread_pool_size,
     transport_url             => $default_transport_url,

releasenotes/notes/remove-amqp1-c99a5ccc0871ad59.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Support for amqp1 messaging driver has been removed.

spec/classes/cinder_init_spec.rb

@@ -45,22 +45,6 @@ describe 'cinder' do
           :rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
           :rabbit_quorum_max_memory_bytes  => '<SERVICE DEFAULT>',
         )
-        is_expected.to contain_oslo__messaging__amqp('cinder_config').with(
-          :server_request_prefix => '<SERVICE DEFAULT>',
-          :broadcast_prefix      => '<SERVICE DEFAULT>',
-          :group_request_prefix  => '<SERVICE DEFAULT>',
-          :container_name        => '<SERVICE DEFAULT>',
-          :idle_timeout          => '<SERVICE DEFAULT>',
-          :trace                 => '<SERVICE DEFAULT>',
-          :ssl_ca_file           => '<SERVICE DEFAULT>',
-          :ssl_cert_file         => '<SERVICE DEFAULT>',
-          :ssl_key_file          => '<SERVICE DEFAULT>',
-          :sasl_mechanisms       => '<SERVICE DEFAULT>',
-          :sasl_config_dir       => '<SERVICE DEFAULT>',
-          :sasl_config_name      => '<SERVICE DEFAULT>',
-          :username              => '<SERVICE DEFAULT>',
-          :password              => '<SERVICE DEFAULT>',
-        )
         is_expected.to contain_oslo__messaging__notifications('cinder_config').with(
           :transport_url => '<SERVICE DEFAULT>',
           :driver        => '<SERVICE DEFAULT>',
@@ -206,29 +190,6 @@ describe 'cinder' do
       ) }
     end
 
-    context 'with amqp overrides' do
-      let :params do
-      {
-        :amqp_idle_timeout  => '60',
-        :amqp_trace         => true,
-        :amqp_ssl_ca_file   => '/path/to/ca.cert',
-        :amqp_ssl_cert_file => '/path/to/certfile',
-        :amqp_ssl_key_file  => '/path/to/key',
-        :amqp_username      => 'amqp_user',
-        :amqp_password      => 'password',
-      }
-      end
-
-      it { is_expected.to contain_oslo__messaging__amqp('cinder_config').with(
-        :idle_timeout  => '60',
-        :trace         => true,
-        :ssl_ca_file   => '/path/to/ca.cert',
-        :ssl_cert_file => '/path/to/certfile',
-        :username      => 'amqp_user',
-        :password      => 'password'
-      ) }
-    end
-
     context 'with image parameters ' do
       let :params do
         req_params.merge({