openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "node_exporter_container_image is needed in 'all' group"

Browse Source
This commit is contained in:
Zuul
2020-11-11 02:22:15 +00:00
committed by Gerrit Code Review
parent 783ff27c73 51ebe2f655
commit e14641dfee
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/ceph-ansible/ceph-base.yaml
View File

@@ -65,6 +65,10 @@ parameters:
type: boolean type: boolean
default: false default: false
description: Parameter used to trigger the dashboard deployment. description: Parameter used to trigger the dashboard deployment.
NodeExporterContainerImage:
description: Ceph NodeExporter container image
default: ''
type: string
CephAnsiblePlaybook: CephAnsiblePlaybook:
type: comma_delimited_list type: comma_delimited_list
description: > description: >
@@ -555,6 +559,7 @@ resources:
- ipv4 - ipv4
dashboard_enabled: {get_param: CephEnableDashboard} dashboard_enabled: {get_param: CephEnableDashboard}
cephfs: {get_param: ManilaCephFSShareBackendName} cephfs: {get_param: ManilaCephFSShareBackendName}
node_exporter_container_image: {get_param: NodeExporterContainerImage}
outputs: outputs:
role_data: role_data:

4
deployment/ceph-ansible/ceph-grafana.yaml
View File

@@ -60,9 +60,6 @@ parameters:
AlertManagerContainerImage: AlertManagerContainerImage:
description: Ceph AlertManager container image description: Ceph AlertManager container image
type: string type: string
NodeExporterContainerImage:
description: Ceph NodeExporter container image
type: string
EnableInternalTLS: EnableInternalTLS:
type: boolean type: boolean
default: false default: false
@@ -96,7 +93,6 @@ resources:
prometheus_container_image: {get_param: PrometheusContainerImage} prometheus_container_image: {get_param: PrometheusContainerImage}
prometheus_port: 9092 prometheus_port: 9092
alertmanager_container_image: {get_param: AlertManagerContainerImage} alertmanager_container_image: {get_param: AlertManagerContainerImage}
node_exporter_container_image: {get_param: NodeExporterContainerImage}
outputs: outputs:
role_data: role_data:
description: Role data for the Ceph Dashboard service. description: Role data for the Ceph Dashboard service.