openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Add missing custom container parameters - overcloud"

Browse Source
This commit is contained in:
Zuul
2021-06-24 21:30:46 +00:00
committed by Gerrit Code Review
parent e423bb068a d46cbb211a
commit 68129460d8
2 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
View File

@@ -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 %}

36
roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
View File

@@ -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 %}