From 700ab15052b0685d70ea3802bd72d453364ede57 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Tue, 23 Aug 2022 14:10:22 +0200 Subject: [PATCH] Add observability_data_only bool This parameter allows the operator to set a condition that will trigger, in the context of the ceph dashboard, only the node-exporter(s) deployment. The parameter will be propagated to the cephadm playbook which is responsible to deploy additional ceph daemons during the overcloud deployment phase. Depends-On: Ia1723394dae5ed03e50f2a236eb808f234e63331 Signed-off-by: Francesco Pantano Change-Id: I7227a7ef7bba9c7eb41af42e5c8e0b9f53955ae6 --- ci/environments/scenario004-standalone.yaml | 1 + deployment/cephadm/ceph-base.yaml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 43734c1a24..8dd0701af7 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -84,3 +84,4 @@ parameter_defaults: ManilaCephFSCephFSProtocolHelperType: 'NFS' DisableCephadm: true CephConfigPath: "/etc/ceph" + CephObservabilityDataOnly: true diff --git a/deployment/cephadm/ceph-base.yaml b/deployment/cephadm/ceph-base.yaml index f0cbf83c0c..fffdd716fc 100644 --- a/deployment/cephadm/ceph-base.yaml +++ b/deployment/cephadm/ceph-base.yaml @@ -46,6 +46,10 @@ parameters: type: boolean default: false description: Parameter used to trigger the dashboard deployment. + CephObservabilityDataOnly: + type: boolean + default: false + description: Parameter used to trigger only node-exporter deployment. CephConfigOverrides: type: json description: Extra config settings to dump into ceph.conf @@ -449,6 +453,7 @@ resources: tripleo_cephadm_container_cli: {get_param: ContainerCli} tripleo_ceph_client_vars: {get_param: CephClientConfigVars} tripleo_cephadm_dashboard_enabled: {get_param: CephEnableDashboard} + tripleo_cephadm_observability_data_only: {get_param: CephObservabilityDataOnly} cephfs: {get_param: ManilaCephFSShareBackendName} tripleo_cephadm_container_ns: {get_attr: [ContainerImageUrlParts, value, host]} tripleo_cephadm_container_image: {get_attr: [ContainerImageUrlParts, value, image]}