node_exporter_container_image is needed in 'all' group

ceph-ansible requires the definition of the node exporter
container in all.yml, but at this time, the related variable
is scoped on the Grafana server role only.
If we want to deploy node exporter containers on all the
overcloud nodes (including the CephStorage nodes), it is
needed in the 'all' group and this is especially true if
when operators are not using the default images but satellite.

# avoid rate limits from quay on non-tripleo containers.
Depends-On: https://review.opendev.org/c/openstack/tripleo-quickstart-extras/+/762400
Change-Id: I7792cb252edf71ab1bb168eac1181365ca98ea7b
Closes-Bug: #1902251
(cherry picked from commit 51ebe2f655)
This commit is contained in:
David Hill 2020-10-28 15:46:37 -04:00 committed by wes hayutin
parent 55eafcb8a7
commit d35ed97714
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: >
@ -575,6 +579,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.