overriding attributes should be the next logical presedence

- using normal to override the attribute will still give the
  chance to override it.
- bugfix version bumped

Change-Id: I24210a953871f37b380eceb297597a6f6629d7af
(cherry picked from commit afc19bd6ce)
This commit is contained in:
Christoph Albers 2019-04-02 16:04:57 +02:00
parent 5c34640dc1
commit 5b66a832b9
2 changed files with 2 additions and 2 deletions

View File

@ -27,7 +27,7 @@ default['openstack']['mq']['cluster'] = false
default['openstack']['mq']['search_for_cluster_disk_nodes'] = true default['openstack']['mq']['search_for_cluster_disk_nodes'] = true
if platform_family?('debian', 'suse') if platform_family?('debian', 'suse')
override['rabbitmq']['use_distro_version'] = true normal['rabbitmq']['use_distro_version'] = true
normal['rabbitmq']['config'] = '/etc/rabbitmq/rabbitmq.config' normal['rabbitmq']['config'] = '/etc/rabbitmq/rabbitmq.config'
end end

View File

@ -3,7 +3,7 @@ maintainer 'openstack-chef'
maintainer_email 'openstack-dev@lists.openstack.org' maintainer_email 'openstack-dev@lists.openstack.org'
license 'Apache-2.0' license 'Apache-2.0'
description 'Provides the shared messaging configuration for Chef for OpenStack.' description 'Provides the shared messaging configuration for Chef for OpenStack.'
version '17.0.3' version '17.0.4'
recipe 'server', 'Installs and configures server packages for messaging queue used by the deployment.' recipe 'server', 'Installs and configures server packages for messaging queue used by the deployment.'
recipe 'rabbitmq-server', 'Installs and configures RabbitMQ and is called via the server recipe' recipe 'rabbitmq-server', 'Installs and configures RabbitMQ and is called via the server recipe'