From 2d46f483759a77c78f317a331e34a0b768e661f8 Mon Sep 17 00:00:00 2001
From: Pavlo Shchelokovskyy <shchelokovskyy@gmail.com>
Date: Thu, 10 May 2018 19:20:11 +0300
Subject: [PATCH] Mark xclarity password as secret

so it is masked during logging.

Change-Id: Iac0639f2884d95afd2d55b521268139ea0ca05f6
Story: #2002023
Task: #19664
---
 ironic/conf/xclarity.py                                      | 1 +
 .../notes/xclarity-mask-password-9fe7605ece7689c3.yaml       | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 releasenotes/notes/xclarity-mask-password-9fe7605ece7689c3.yaml

diff --git a/ironic/conf/xclarity.py b/ironic/conf/xclarity.py
index 2bca905a7d..a14901ce9d 100644
--- a/ironic/conf/xclarity.py
+++ b/ironic/conf/xclarity.py
@@ -28,6 +28,7 @@ opts = [
                       'in the Stein release. Please update the driver_info '
                       'field to use "xclarity_username" instead')),
     cfg.StrOpt('password',
+               secret=True,
                help=_('Password for XClarity Controller username. '
                       'Configuration here is deprecated and will be removed '
                       'in the Stein release. Please update the driver_info '
diff --git a/releasenotes/notes/xclarity-mask-password-9fe7605ece7689c3.yaml b/releasenotes/notes/xclarity-mask-password-9fe7605ece7689c3.yaml
new file mode 100644
index 0000000000..615af27e58
--- /dev/null
+++ b/releasenotes/notes/xclarity-mask-password-9fe7605ece7689c3.yaml
@@ -0,0 +1,5 @@
+---
+security:
+  - |
+    Xclarity password specified in configuration file is now properly masked
+    during logging.