commit 246d9bbd4a13cc2848411eda81eac8b311850717
author Thomas Maddox <thomas.maddox@rackspace.com> Thu Oct 24 18:57:40 2013 +0000
committer Thomas Maddox <thomas.maddox@rackspace.com> Fri Oct 25 13:09:22 2013 +0000
tree 77efaa8441dcafa678db109a82234b88ec5a6ad1
parent 5ceb0e289b5427c89b0c968575fcde1d5100bdfc

Add PostgreSQL option for Ceilometer backend

Adds the PostgreSQL case for a Ceilometer backend and
initializes Ceilometer accordingly.

Closes-Bug: #1244381
Change-Id: Iefc5bb7eea6e9efa1f2ad04f1f8dc714e3404c9c

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index cd4c4d8..a79ca55 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -91,7 +91,7 @@
     iniset $CEILOMETER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
     iniset $CEILOMETER_CONF keystone_authtoken signing_dir $CEILOMETER_AUTH_CACHE_DIR
 
-    if [[ "$CEILOMETER_BACKEND" = 'mysql' ]]; then
+    if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then
         iniset $CEILOMETER_CONF database connection `database_connection_url ceilometer`
     else
         iniset $CEILOMETER_CONF database connection mongodb://localhost:27017/ceilometer
@@ -116,7 +116,7 @@
     sudo chown $STACK_USER $CEILOMETER_AUTH_CACHE_DIR
     rm -f $CEILOMETER_AUTH_CACHE_DIR/*
 
-    if [[ "$CEILOMETER_BACKEND" = 'mysql' ]]; then
+    if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then
         recreate_database ceilometer utf8
         $CEILOMETER_BIN_DIR/ceilometer-dbsync
     fi