From bbc732c40e0cfc45409ee7d061852e1421f4c72e Mon Sep 17 00:00:00 2001
From: Yian Zong <yian.zong@dell.com>
Date: Thu, 28 Sep 2023 07:48:06 +0000
Subject: [PATCH] Revert "Dell PowerFlex password appears in plain text when
 creating a volume"

This reverts commit 33661ece808a6c32ad36aee0acb46a3c0624d7ce.

Reason for revert: breaks reading password from the config file

Change-Id: I840d8c4d66daf0ab8636617b42cdb47dd4313cc9
---
 os_brick/__init__.py                                 | 2 --
 os_brick/privileged/__init__.py                      | 8 --------
 os_brick/privileged/scaleio.py                       | 2 +-
 releasenotes/notes/bug-2003179-44a6c90dd17c88f7.yaml | 7 -------
 4 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 releasenotes/notes/bug-2003179-44a6c90dd17c88f7.yaml

diff --git a/os_brick/__init__.py b/os_brick/__init__.py
index e939cd3b9..602a8ccae 100644
--- a/os_brick/__init__.py
+++ b/os_brick/__init__.py
@@ -17,8 +17,6 @@ from os_brick import opts
 
 
 LOG = logging.getLogger(__name__)
-SECURE_LOG = logging.getLogger('brick-privsep-hide-output')
-SECURE_LOG.setLevel(logging.ERROR)
 
 
 def setup(conf, **kwargs):
diff --git a/os_brick/privileged/__init__.py b/os_brick/privileged/__init__.py
index cf3513dcb..4fc348c75 100644
--- a/os_brick/privileged/__init__.py
+++ b/os_brick/privileged/__init__.py
@@ -33,11 +33,3 @@ default = priv_context.PrivContext(
     capabilities=capabilities,
     logger_name=__name__,
 )
-
-brick_privsep_hide_output = priv_context.PrivContext(
-    __name__,
-    cfg_section='privsep_osbrick',
-    pypath=__name__ + '.default',
-    capabilities=capabilities,
-    logger_name='brick_privsep_hide_output',
-)
diff --git a/os_brick/privileged/scaleio.py b/os_brick/privileged/scaleio.py
index 15969e939..4b619b45f 100644
--- a/os_brick/privileged/scaleio.py
+++ b/os_brick/privileged/scaleio.py
@@ -74,7 +74,7 @@ def rescan_vols(op_code):
         ioctl(fd, op_code, struct.pack('Q', 0))
 
 
-@privileged.brick_privsep_hide_output.entrypoint
+@privileged.default.entrypoint
 def get_connector_password(filename, config_group, failed_over):
     """Read ScaleIO connector configuration file and get appropriate password.
 
diff --git a/releasenotes/notes/bug-2003179-44a6c90dd17c88f7.yaml b/releasenotes/notes/bug-2003179-44a6c90dd17c88f7.yaml
deleted file mode 100644
index a1f3f7334..000000000
--- a/releasenotes/notes/bug-2003179-44a6c90dd17c88f7.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-fixes:
-  - |
-    `Bug #2003179  <https://bugs.launchpad.net/cinder/+bug/2003179>`_: Fixed
-    issue with the ScaleIO connector where privsep was logging
-    password in plaintext. This was fixed by creating a new logger for the
-    ScaleIO connector with default log level set to ERROR.