Add missing AMQP attributes

There are some settings that are useful for tweaking AMQP
settings in all the service configurations that should
be made available for setting. This adds flags for durable_queues,
auto_delete, and a setting for QPID topology version that
is required to be set correctly to use QPID federation.

There will need to be dependent changes to utilize these
in the project specific cookbooks.

Change-Id: I850c01a40aab02cf4531f7983543ef89e0e60446

CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG for cookbook-openstack-common
 
 This file is used to list changes made in each version of cookbook-openstack-common.
+
+## 9.4.0
+* Add durable_queues, auto_delete, and qpid topology version attributes
+
 ## 9.3.0
 * Provide an option to specify the password when dev mode equals true
 

attributes/messaging.rb

@@ -44,10 +44,16 @@ default['openstack']['mq']['service_type'] = 'rabbitmq'
 default['openstack']['mq']['user'] = 'guest'
 default['openstack']['mq']['vhost'] = '/'
 
+# defined in oslo/messaging/_drivers/amqp.py
+default['openstack']['mq']['durable_queues'] = false
+default['openstack']['mq']['auto_delete'] = false
+
 ###################################################################
 # Default qpid and rabbit values (for attribute assignment below)
 ###################################################################
 default['openstack']['mq']['qpid']['protocol'] = 'tcp'
+# defined in oslo/messaging/_drivers/impl_qpid.py
+default['openstack']['mq']['qpid']['topology_version'] = 1
 qpid_defaults = {
   username: node['openstack']['mq']['user'],
   sasl_mechanisms: '',
@@ -62,7 +68,8 @@ qpid_defaults = {
   tcp_nodelay: true,
   host: node['openstack']['endpoints']['mq']['host'],
   port: node['openstack']['endpoints']['mq']['port'],
-  qpid_hosts: ["#{node['openstack']['endpoints']['mq']['host']}:#{node['openstack']['endpoints']['mq']['port']}"]
+  qpid_hosts: ["#{node['openstack']['endpoints']['mq']['host']}:#{node['openstack']['endpoints']['mq']['port']}"],
+  topology_version: node['openstack']['mq']['qpid']['topology_version']
 }
 
 rabbit_defaults = {
@@ -81,6 +88,11 @@ services.each do |svc|
   default['openstack']['mq'][svc]['service_type'] = node['openstack']['mq']['service_type']
   default['openstack']['mq'][svc]['notification_topic'] = 'notifications'
 
+  default['openstack']['mq'][svc]['durable_queues'] =
+    node['openstack']['mq']['durable_queues']
+  default['openstack']['mq'][svc]['auto_delete'] =
+    node['openstack']['mq']['auto_delete']
+
   case node['openstack']['mq'][svc]['service_type']
   when 'qpid'
     qpid_defaults.each do |key, val|

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'cookbooks@lists.tfoundry.com'
 license          'Apache 2.0'
 description      'Common OpenStack attributes, libraries and recipes.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '9.3.0'
+version          '9.4.0'
 
 recipe           'openstack-common', 'Installs/Configures common recipes'
 recipe           'openstack-common::set_endpoints_by_interface', 'Set endpoints by interface'