Hiding postgresql password in connection string

Closes-Bug: #1266804
Change-Id: Iafc820d6201acf5b563b62bd9f20a715901f1ab4

diff --git a/cinder/service.py b/cinder/service.py
index 02674f5cfee11b65a0f4eb63a7a496f14f134588..ea21cd4eba284f781922db7dc8eaab00750e4d63 100644 (file)
--- 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' %