From bc5e76a8cba00cc5dcba052c03e2dcdab0afabbc Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Tue, 11 Mar 2014 15:31:05 +0000
Subject: [PATCH] Update qpid attributes

This change finishes off bp use-data-bag-for-qpid-password by removing
the unnecessary qpid attribute and defaulting qpid username to the same
value as openstack.mq.user.

Change-Id: I3ee99989c54fcda746eacb5c38011308494dc394
Implements: blueprint use-data-bag-for-qpid-password
---
 CHANGELOG.md            | 5 +++++
 attributes/messaging.rb | 3 +--
 metadata.rb             | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d86beac4..b565bc9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 This file is used to list changes made in each version of cookbook-openstack-common.
 
+## 8.3.0
+### Blueprint
+* use-data-bag-for-qpid-password: have qpid use get_password method rather than
+  using a password attribute
+
 ## 8.2.1
 ### Bug
 * Add notification_topics attribute to network attributes
diff --git a/attributes/messaging.rb b/attributes/messaging.rb
index 12d5463f..fae295a0 100644
--- a/attributes/messaging.rb
+++ b/attributes/messaging.rb
@@ -53,8 +53,7 @@ default['openstack']['mq']['vhost'] = '/'
 # Default qpid and rabbit values (for attribute assignment below)
 ###################################################################
 qpid_defaults = {
-  username: '',
-  password: '',
+  username: node['openstack']['mq']['user'],
   sasl_mechanisms: '',
   reconnect: true,
   reconnect_timeout: 0,
diff --git a/metadata.rb b/metadata.rb
index 6dba1052..e2129219 100644
--- a/metadata.rb
+++ b/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          '8.2.1'
+version          '8.3.0'
 
 recipe           'openstack-common', 'Installs/Configures common recipes'
 recipe           'openstack-common::set_endpoints_by_interface', 'Set endpoints by interface'