From 42f59769feee674c6a35b6a44ed5fc826f495118 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Mon, 10 May 2021 16:02:06 +0200 Subject: [PATCH] Expose the monitoring_stack network to cephadm cephadm accepts a network parameter, which is used by the rendered spec to identify the network address block used to deploy a given daemon. This patch just exposes (like we've done for RGW and Ganesha) the network where the monitoring stack components (node-exporter, prometheus and alertmanager) should be bound. Depends-On: I59a74797dc97540b7553a3e74f67e23e6ccc8f6d Change-Id: Icc779d7d2608e5a8c1fbc68973a987a9c268244d (cherry picked from commit 5369ff9bdeda9c43718afd1afc05345451356761) --- deployment/cephadm/ceph-grafana.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deployment/cephadm/ceph-grafana.yaml b/deployment/cephadm/ceph-grafana.yaml index 344ffe4591..a331995d0d 100644 --- a/deployment/cephadm/ceph-grafana.yaml +++ b/deployment/cephadm/ceph-grafana.yaml @@ -114,6 +114,11 @@ resources: tripleo_cephadm_node_exporter_container_image: {get_param: NodeExporterContainerImage} tripleo_cephadm_prometheus_port: 9092 tripleo_cephadm_alertmanager_container_image: {get_param: AlertManagerContainerImage} + tripleo_cephadm_monitoring_address_block: + list_join: + - ',' + - get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephGrafanaNetwork]}] + outputs: role_data: