From d46cbb211a08f9b7a140986e24ac4feb5a5badcf Mon Sep 17 00:00:00 2001
From: Ronelle Landy <rlandy@redhat.com>
Date: Fri, 18 Jun 2021 13:55:20 -0400
Subject: [PATCH] Add missing custom container parameters - overcloud

roles/standalone/tasks/containers.yml has a number of
ceph-related and other custom parameters that were
missing from the overcloud prep parameters.

This review adds those custom parameters to ensure
that the correct containers (from the desired
registries and namespaces) are used.

Change-Id: Id3b1ea025b748dee578e5bfb1cdd41d0bb7f7383
---
 .../templates/overcloud-prep-containers.sh.j2 | 36 +++++++++++++++++++
 .../containers-prepare-parameter.yaml.j2      | 36 +++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2 b/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
index abff75b36..5683b8f8c 100644
--- a/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
+++ b/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
@@ -75,6 +75,42 @@ openstack overcloud container image prepare \
 {% if docker_ceph_tag is defined %}
     --set "ceph_tag={{ docker_ceph_tag }}" \
 {% endif %}
+{% if custom_ceph_alertmanager_image is defined %}
+    --set "ceph_alertmanager_image={{ custom_ceph_alertmanager_image }}" \
+{% endif %}
+{% if custom_ceph_alertmanager_namespace is defined %}
+    --set "ceph_alertmanager_namespace={{ custom_ceph_alertmanager_namespace }}" \
+{% endif %}
+{% if custom_ceph_alertmanager_tag is defined %}
+    --set "ceph_alertmanager_tag={{ custom_ceph_alertmanager_tag }}" \
+{% endif %}
+{% if custom_ceph_grafana_image is defined %}
+    --set "ceph_grafana_image={{ custom_ceph_grafana_image }}" \
+{% endif %}
+{% if custom_ceph_grafana_namespace is defined %}
+    --set "ceph_grafana_namespace={{ custom_ceph_grafana_namespace }}" \
+{% endif %}
+{% if custom_ceph_grafana_tag is defined %}
+    --set "ceph_grafana_tag={{ custom_ceph_grafana_tag }}" \
+{% endif %}
+{% if custom_ceph_node_exporter_image is defined %}
+    --set "ceph_node_exporter_image={{ custom_ceph_node_exporter_image }}" \
+{% endif %}
+{% if custom_ceph_node_exporter_namespace is defined %}
+    --set "ceph_node_exporter_namespace={{ custom_ceph_node_exporter_namespace }}" \
+{% endif %}
+{% if custom_ceph_node_exporter_tag is defined %}
+    --set "ceph_node_exporter_tag={{ custom_ceph_node_exporter_tag }}" \
+{% endif %}
+{% if custom_ceph_prometheus_image is defined %}
+    --set "ceph_prometheus_image={{ custom_ceph_prometheus_image }}" \
+{% endif %}
+{% if custom_ceph_prometheus_namespace is defined %}
+    --set "ceph_prometheus_namespace={{ custom_ceph_prometheus_namespace }}" \
+{% endif %}
+{% if custom_ceph_prometheus_tag is defined %}
+    --set "ceph_prometheus_tag={{ custom_ceph_prometheus_tag }}" \
+{% endif %}
 {% if docker_openshift_namespace is defined %}
     --set openshift_namespace={{ docker_openshift_namespace }} \
 {% endif %}
diff --git a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
index f741d76d4..cb7f5b9dc 100644
--- a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
+++ b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
@@ -48,6 +48,42 @@ parameter_defaults:
       ceph_namespace: "{{ docker_ceph_namespace }}"
       ceph_image: "{{ docker_ceph_image }}"
       ceph_tag: "{{ docker_ceph_tag }}"
+{% if custom_ceph_alertmanager_image is defined %}
+      ceph_alertmanager_image: "{{ custom_ceph_alertmanager_image }}"
+{% endif %}
+{% if custom_ceph_alertmanager_namespace is defined %}
+      ceph_alertmanager_namespace: "{{ custom_ceph_alertmanager_namespace }}"
+{% endif %}
+{% if custom_ceph_alertmanager_tag is defined %}
+      ceph_alertmanager_tag: "{{ custom_ceph_alertmanager_tag }}"
+{% endif %}
+{% if custom_ceph_grafana_image is defined %}
+      ceph_grafana_image: "{{ custom_ceph_grafana_image }}"
+{% endif %}
+{% if custom_ceph_grafana_namespace is defined %}
+      ceph_grafana_namespace: "{{ custom_ceph_grafana_namespace }}"
+{% endif %}
+{% if custom_ceph_grafana_tag is defined %}
+      ceph_grafana_tag: "{{ custom_ceph_grafana_tag }}"
+{% endif %}
+{% if custom_ceph_node_exporter_image is defined %}
+      ceph_node_exporter_image: "{{ custom_ceph_node_exporter_image }}"
+{% endif %}
+{% if custom_ceph_node_exporter_namespace is defined %}
+      ceph_node_exporter_namespace: "{{ custom_ceph_node_exporter_namespace }}"
+{% endif %}
+{% if custom_ceph_node_exporter_tag is defined %}
+      ceph_node_exporter_tag: "{{ custom_ceph_node_exporter_tag }}"
+{% endif %}
+{% if custom_ceph_prometheus_image is defined %}
+      ceph_prometheus_image: "{{ custom_ceph_prometheus_image }}"
+{% endif %}
+{% if custom_ceph_prometheus_namespace is defined %}
+      ceph_prometheus_namespace: "{{ custom_ceph_prometheus_namespace }}"
+{% endif %}
+{% if custom_ceph_prometheus_tag is defined %}
+      ceph_prometheus_tag: "{{ custom_ceph_prometheus_tag }}"
+{% endif %}
 {% if docker_openshift_namespace is defined %}
       openshift_namespace: "{{ docker_openshift_namespace }}"
 {% endif %}