From: galstrom21 <jshepher@rackspace.com>
Date: Tue, 7 Jan 2014 16:38:06 +0000 (-0600)
Subject: Hiding postgresql password in connection string
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d64478fd35a7024f46fa8dbf54103a7a0e30be5a;p=openstack-build%2Fcinder-build.git

Hiding postgresql password in connection string

Closes-Bug: #1266804
Change-Id: Iafc820d6201acf5b563b62bd9f20a715901f1ab4
---

diff --git a/cinder/service.py b/cinder/service.py
index 02674f5cf..ea21cd4eb 100644
--- a/cinder/service.py
+++ b/cinder/service.py
@@ -633,7 +633,8 @@ def wait():
         # hide flag contents from log if contains a password
         # should use secret flag when switch over to openstack-common
         if ("_password" in flag or "_key" in flag or
-                (flag == "sql_connection" and "mysql:" in flag_get)):
+                (flag == "sql_connection" and
+                    ("mysql:" in flag_get or "postgresql:" in flag_get))):
             LOG.debug(_('%s : FLAG SET ') % flag)
         else:
             LOG.debug('%(flag)s : %(flag_get)s' %