From fabfdc83deb4d86c9adbf85129222b5934b49705 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Fri, 17 Dec 2021 11:24:07 +0100 Subject: [PATCH] Add CephAdmVerbose variable The final step of the cephadm playbook calls post.yaml, which is able to print the status of the cluster and export it as a ceph compatible spec retrieved from the Ceph cluster. However, in a tls-everywhere context, we should be able to stop logging the spec as it contains sensitive info (the priv key). This change just adds the CephAdmVerbose tht varibale to control what is printed. The variable is set to true in both Ceph related scenarios tested in the tripleo-ci. Depends-On: I7bef5922d75114e4bd1924b52a382e61d7027d2d Change-Id: I1db48dcc004223b90c3505bd447530593be487bf --- ci/environments/scenario001-standalone.yaml | 1 + ci/environments/scenario004-standalone.yaml | 1 + deployment/cephadm/ceph-base.yaml | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index e4359600db..6d06e63649 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -178,6 +178,7 @@ parameter_defaults: - tty5 - tty6 ContainerCli: podman + CephAdmVerbose: true CephConfigOverrides: anotherkey: anothervalue global: diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index a2a71d8ccc..1008b75767 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -37,6 +37,7 @@ parameter_defaults: CephPoolDefaultSize: 1 CephEnableDashboard: false CephDashboardPort: 8445 + CephAdmVerbose: true GrafanaDashboardPort: 3200 CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' diff --git a/deployment/cephadm/ceph-base.yaml b/deployment/cephadm/ceph-base.yaml index e871230a0c..d0ca884dbb 100644 --- a/deployment/cephadm/ceph-base.yaml +++ b/deployment/cephadm/ceph-base.yaml @@ -404,6 +404,12 @@ parameters: description: | If this parameter is true, then cephadm sets the debug related mgr config-key and produces a more verbose output. + CephAdmVerbose: + type: boolean + default: false + description: | + If this parameter is true, the cephadm playbook is able to print + some ceph related information during its execution. DeployedCeph: default: false type: boolean @@ -522,6 +528,7 @@ resources: tripleo_cephadm_container_tag: {get_attr: [ContainerImageUrlParts, value, image_tag]} tripleo_cephadm_crush_rules: {get_param: CephCrushRules} tripleo_cephadm_debug: {get_param: CephAdmDebug} + tripleo_cephadm_verbose: {get_param: CephAdmVerbose} tripleo_cephadm_rbd_trash: {get_param: CephRbdTrashPurgeInterval} tripleo_cephadm_apply_ceph_conf_overrides_on_update: {get_param: ApplyCephConfigOverridesOnUpdate} ceph_container_registry_auth: