From cf0db5598d898d580855989b0201cd43b0ca54df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionu=C8=9B=20Ar=C8=9B=C4=83ri=C8=99i?= <iartarisi@suse.cz>
Date: Wed, 11 Jun 2014 16:30:49 +0200
Subject: [PATCH] add Trove attributes (mq, endpoints, database)

Change-Id: Idb112a2ad9ca8c064b5f023bf3e8916ee04f5857
---
 CHANGELOG.md            |  4 ++++
 attributes/database.rb  |  8 ++++++++
 attributes/default.rb   | 13 ++++++++++++-
 attributes/messaging.rb |  5 +++--
 metadata.rb             |  2 +-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02b164d5..7b2b2be8 100755
--- a/CHANGELOG.md
+++ b/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.5.1
+* Add Trove endpoints, database and mq attributes
+
 ## 9.5.0
 * Add new image_id cli library method for obtaining glance ID from image name
 
diff --git a/attributes/database.rb b/attributes/database.rb
index e57443fa..8fc3169c 100644
--- a/attributes/database.rb
+++ b/attributes/database.rb
@@ -179,6 +179,14 @@ default['openstack']['db']['orchestration']['db_name'] = 'heat'
 default['openstack']['db']['orchestration']['username'] = 'heat'
 default['openstack']['db']['orchestration']['options'] = node['openstack']['db']['options']
 
+# Database used by OpenStack Database (Trove)
+default['openstack']['db']['database']['service_type'] = node['openstack']['db']['service_type']
+default['openstack']['db']['database']['host'] = node['openstack']['endpoints']['db']['host']
+default['openstack']['db']['database']['port'] = node['openstack']['endpoints']['db']['port']
+default['openstack']['db']['database']['db_name'] = 'trove'
+default['openstack']['db']['database']['username'] = 'trove'
+default['openstack']['db']['database']['options'] = node['openstack']['db']['options']
+
 # Switch to store the MySQL root password in a databag instead of
 # using the generated OpenSSL cookbook secure_password one.
 default['openstack']['db']['root_user_use_databag'] = false
diff --git a/attributes/default.rb b/attributes/default.rb
index 703a6993..df5109bc 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -4,7 +4,7 @@
 # Attributes:: default
 #
 # Copyright 2012-2013, AT&T Services, Inc.
-# Copyright 2013, SUSE Linux GmbH
+# Copyright 2013-2014, SUSE Linux GmbH
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -357,6 +357,17 @@ default['openstack']['endpoints']['orchestration-api-cloudwatch']['port'] = '800
 default['openstack']['endpoints']['orchestration-api-cloudwatch']['path'] = '/v1'
 default['openstack']['endpoints']['orchestration-api-cloudwatch']['bind_interface'] = nil
 
+# The OpenStack Database (Trove) API endpoint
+default['openstack']['endpoints']['database-api-bind']['host'] = node['openstack']['endpoints']['bind-host']
+default['openstack']['endpoints']['database-api-bind']['port'] = '8779'
+default['openstack']['endpoints']['database-api-bind']['bind_interface'] = nil
+
+default['openstack']['endpoints']['database-api']['host'] = node['openstack']['endpoints']['host']
+default['openstack']['endpoints']['database-api']['scheme'] = 'http'
+default['openstack']['endpoints']['database-api']['port'] = '8779'
+default['openstack']['endpoints']['database-api']['path'] = '/v1'
+default['openstack']['endpoints']['database-api']['bind_interface'] = nil
+
 # Alternately, if you used some standardized DNS naming scheme, you could
 # do something like this, which would override any part-wise specifications above.
 #
diff --git a/attributes/messaging.rb b/attributes/messaging.rb
index 41765045..29238699 100644
--- a/attributes/messaging.rb
+++ b/attributes/messaging.rb
@@ -4,7 +4,7 @@
 # Attributes:: messaging
 #
 # Copyright 2012-2013, AT&T Services, Inc.
-# Copyright 2013, SUSE Linux GmbH
+# Copyright 2013-2014, SUSE Linux GmbH
 # Copyright 2013-2014, Rackspace US, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,7 +34,8 @@ default['openstack']['endpoints']['mq']['bind_interface'] = nil
 ###################################################################
 # Services to assign mq attributes for
 ###################################################################
-services = %w{block-storage compute image telemetry network orchestration}
+services = %w{block-storage compute database image
+              telemetry network orchestration}
 
 ###################################################################
 # Generic default attributes
diff --git a/metadata.rb b/metadata.rb
index f5e794f2..aaf64bdb 100755
--- 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          '9.5.0'
+version          '9.5.1'
 
 recipe           'openstack-common', 'Installs/Configures common recipes'
 recipe           'openstack-common::set_endpoints_by_interface', 'Set endpoints by interface'