From 17b2e731a9a90e1d0144acf6d062b220c09c1384 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Mon, 11 May 2020 16:53:24 +0200
Subject: [PATCH] Remove unnecessary Ceph{Admin,Mon,Mds}Key constants

these are not necessary because ceph-ansible will generate them
randomly and completely ignored in recent versions of the templates

Change-Id: I2441d293c56775a723ae5979596d9e70ec1a4182
Depends-On: If77935345de70ae261b091b8bf49b997dc71a781
Related-Bug: 1878014
(cherry picked from commit c3b4705161cb74169ef8fa9ec5796d8a6c7c0f16)
---
 tripleo_common/constants.py                     | 3 ---
 tripleo_common/tests/actions/test_parameters.py | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/tripleo_common/constants.py b/tripleo_common/constants.py
index 4d38671e6..0c28506c6 100644
--- a/tripleo_common/constants.py
+++ b/tripleo_common/constants.py
@@ -81,12 +81,9 @@ PASSWORD_PARAMETER_NAMES = (
     'BarbicanSimpleCryptoKek',
     'CeilometerMeteringSecret',
     'CeilometerPassword',
-    'CephAdminKey',
     'CephClientKey',
     'CephClusterFSID',
-    'CephMdsKey',
     'CephManilaClientKey',
-    'CephMonKey',
     'CephRgwKey',
     'CephGrafanaAdminPassword',
     'CephDashboardAdminPassword',
diff --git a/tripleo_common/tests/actions/test_parameters.py b/tripleo_common/tests/actions/test_parameters.py
index aab0472d7..582ca1bc1 100644
--- a/tripleo_common/tests/actions/test_parameters.py
+++ b/tripleo_common/tests/actions/test_parameters.py
@@ -48,7 +48,6 @@ _EXISTING_PASSWORDS = {
     'RabbitPassword': 'ahuHRXdPMx9rzCdjD9CJJNCgA',
     'RpcPassword': 'ahuHRXdPMx9rzCdjD9CJJNCgA',
     'NotifyPassword': 'ahuHRXdPMx9rzCdjD9CJJNCgA',
-    'CephAdminKey': b'AQCQXtlXAAAAABAAT4Gk+U8EqqStL+JFa9bp1Q==',
     'HAProxyStatsPassword': 'P8tbdK6n4YUkTaUyy8XgEVTe6',
     'CeilometerPassword': 'RRdpwK6qf2pbKz2UtzxqauAdk',
     'GnocchiPassword': 'cRYHcUkMuJeK3vyU9pCaznUZc',
@@ -62,9 +61,7 @@ _EXISTING_PASSWORDS = {
     'OctaviaCaKeyPassphrase': 'SLj4c3uCk4DDxPwQOG1Heb==',
     'ManilaPassword': 'NYJN86Fua3X8AVFWmMhQa2zTH',
     'NeutronMetadataProxySharedSecret': 'Q2YgUCwmBkYdqsdhhCF4hbghu',
-    'CephMdsKey': b'AQCQXtlXAAAAABAAT4Gk+U8EqqStL+JFa9bp1Q==',
     'CephManilaClientKey': b'AQANOFFY1NW6AxAAu6jWI3YSOsp2QWusb5Y3DQ==',
-    'CephMonKey': b'AQCQXtlXAAAAABAA9l+59N3yH+C49Y0JiKeGFg==',
     'CephGrafanaAdminPassword': 'NYJN86Fua3X8AVFWmMhQa2zTH',
     'CephDashboardAdminPassword': 'NYJN86Fua3X8AVFWmMhQa2zTH',
     'SwiftHashSuffix': 'td8mV6k7TYEGKCDvjVBwckpn9',