Merge "node_exporter_container_image is needed in 'all' group"

This commit is contained in:
Zuul 2020-11-11 02:22:15 +00:00 committed by Gerrit Code Review
commit e14641dfee
2 changed files with 5 additions and 4 deletions

View File

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

View File

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