openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Add vars for setting images for openshift 3.11 

Add possibility to set the new container images for ocp 3.11 images
during the image prepare step.

The change hooks the variables both to the `openstack overcloud
container image prepare` command and to the generated
containers-prepare-parameter.yaml file for the image prepare workflow.

Depends-on: Ibbd5ff9d3597f5add440b92a27a2f2f669f7bdbe

Change-Id: I3d59dcd2e50f2e96a7a97cb836a791a52dd6dc9a
This commit is contained in:
Martin André 2018-10-23 11:34:55 +02:00
parent 61357f8e12
commit 0130fed331
2 changed files with 148 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,8 +66,8 @@ openstack overcloud container image prepare \
{% if docker_openshift_tag is defined %}
--set openshift_tag={{ docker_openshift_tag }} \
{% endif %}
{% if docker_openshift_base_image is defined %}
--set openshift_base_image={{ docker_openshift_base_image }} \
{% if docker_openshift_prefix is defined %}
--set openshift_prefix={{ docker_openshift_prefix }} \
{% endif %}
{% if docker_openshift_cockpit_namespace is defined %}
--set openshift_cockpit_namespace={{ docker_openshift_cockpit_namespace }} \
@ -107,6 +107,78 @@ openstack overcloud container image prepare \
{% endif %}
{% if docker_openshift_heketi_tag is defined %}
--set openshift_heketi_tag={{ docker_openshift_heketi_tag }} \
{% endif %}
{% if docker_openshift_cluster_monitoring_namespace is defined %}
--set openshift_cluster_monitoring_namespace={{ docker_openshift_cluster_monitoring_namespace }} \
{% endif %}
{% if docker_openshift_cluster_monitoring_image is defined %}
--set openshift_cluster_monitoring_image={{ docker_openshift_cluster_monitoring_image }} \
{% endif %}
{% if docker_openshift_cluster_monitoring_tag is defined %}
--set openshift_cluster_monitoring_tag={{ docker_openshift_cluster_monitoring_tag }} \
{% endif %}
{% if docker_openshift_configmap_reload_namespace is defined %}
--set openshift_configmap_reload_namespace={{ docker_openshift_configmap_reload_namespace }} \
{% endif %}
{% if docker_openshift_configmap_reload_image is defined %}
--set openshift_configmap_reload_image={{ docker_openshift_configmap_reload_image }} \
{% endif %}
{% if docker_openshift_configmap_reload_tag is defined %}
--set openshift_configmap_reload_tag={{ docker_openshift_configmap_reload_tag }} \
{% endif %}
{% if docker_openshift_prometheus_operator_namespace is defined %}
--set openshift_prometheus_operator_namespace={{ docker_openshift_prometheus_operator_namespace }} \
{% endif %}
{% if docker_openshift_prometheus_operator_image is defined %}
--set openshift_prometheus_operator_image={{ docker_openshift_prometheus_operator_image }} \
{% endif %}
{% if docker_openshift_prometheus_operator_tag is defined %}
--set openshift_prometheus_operator_tag={{ docker_openshift_prometheus_operator_tag }} \
{% endif %}
{% if docker_openshift_prometheus_config_reload_namespace is defined %}
--set openshift_prometheus_config_reload_namespace={{ docker_openshift_prometheus_config_reload_namespace }} \
{% endif %}
{% if docker_openshift_prometheus_config_reload_image is defined %}
--set openshift_prometheus_config_reload_image={{ docker_openshift_prometheus_config_reload_image }} \
{% endif %}
{% if docker_openshift_prometheus_config_reload_tag is defined %}
--set openshift_prometheus_config_reload_tag={{ docker_openshift_prometheus_config_reload_tag }} \
{% endif %}
{% if docker_openshift_prometheus_tag is defined %}
--set openshift_prometheus_tag={{ docker_openshift_prometheus_tag }} \
{% endif %}
{% if docker_openshift_prometheus_alertmanager_tag is defined %}
--set openshift_prometheus_alertmanager_tag={{ docker_openshift_prometheus_alertmanager_tag }} \
{% endif %}
{% if docker_openshift_prometheus_node_exporter_tag is defined %}
--set openshift_prometheus_node_exporter_tag={{ docker_openshift_prometheus_node_exporter_tag }} \
{% endif %}
{% if docker_openshift_oauth_proxy_tag is defined %}
--set openshift_oauth_proxy_tag={{ docker_openshift_oauth_proxy_tag }} \
{% endif %}
{% if docker_openshift_kube_rbac_proxy_namespace is defined %}
--set openshift_kube_rbac_proxy_namespace={{ docker_openshift_kube_rbac_proxy_namespace }} \
{% endif %}
{% if docker_openshift_kube_rbac_proxy_image is defined %}
--set openshift_kube_rbac_proxy_image={{ docker_openshift_kube_rbac_proxy_image }} \
{% endif %}
{% if docker_openshift_kube_rbac_proxy_tag is defined %}
--set openshift_kube_rbac_proxy_tag={{ docker_openshift_kube_rbac_proxy_tag }} \
{% endif %}
{% if docker_openshift_kube_state_metrics_namespace is defined %}
--set openshift_kube_state_metrics_namespace={{ docker_openshift_kube_state_metrics_namespace }} \
{% endif %}
{% if docker_openshift_kube_state_metrics_image is defined %}
--set openshift_kube_state_metrics_image={{ docker_openshift_kube_state_metrics_image }} \
{% endif %}
{% if docker_openshift_kube_state_metrics_tag is defined %}
--set openshift_kube_state_metrics_tag={{ docker_openshift_kube_state_metrics_tag }} \
{% endif %}
{% if docker_openshift_grafana_namespace is defined %}
--set openshift_grafana_namespace={{ docker_openshift_grafana_namespace }} \
{% endif %}
{% if docker_openshift_grafana_tag is defined %}
--set openshift_grafana_tag={{ docker_openshift_grafana_tag }} \
{% endif %}
--push-destination {{ local_docker_registry_host }}:8787

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

@ -27,8 +27,8 @@ parameter_defaults:
{% if docker_openshift_tag is defined %}
openshift_tag: "{{ docker_openshift_tag }}"
{% endif %}
{% if docker_openshift_base_image is defined %}
openshift_base_image: "{{ docker_openshift_base_image }}"
{% if docker_openshift_prefix is defined %}
openshift_prefix: "{{ docker_openshift_prefix }}"
{% endif %}
{% if docker_openshift_cockpit_namespace is defined %}
openshift_cockpit_namespace: "{{ docker_openshift_cockpit_namespace }}"
@ -69,3 +69,75 @@ parameter_defaults:
{% if docker_openshift_heketi_tag is defined %}
openshift_heketi_tag: "{{ docker_openshift_heketi_tag }}"
{% endif %}
{% if docker_openshift_cluster_monitoring_namespace is defined %}
openshift_cluster_monitoring_namespace: "{{ docker_openshift_cluster_monitoring_namespace }}"
{% endif %}
{% if docker_openshift_cluster_monitoring_image is defined %}
openshift_cluster_monitoring_image: "{{ docker_openshift_cluster_monitoring_image }}"
{% endif %}
{% if docker_openshift_cluster_monitoring_tag is defined %}
openshift_cluster_monitoring_tag: "{{ docker_openshift_cluster_monitoring_tag }}"
{% endif %}
{% if docker_openshift_configmap_reload_namespace is defined %}
openshift_configmap_reload_namespace: "{{ docker_openshift_configmap_reload_namespace }}"
{% endif %}
{% if docker_openshift_configmap_reload_image is defined %}
openshift_configmap_reload_image: "{{ docker_openshift_configmap_reload_image }}"
{% endif %}
{% if docker_openshift_configmap_reload_tag is defined %}
openshift_configmap_reload_tag: "{{ docker_openshift_configmap_reload_tag }}"
{% endif %}
{% if docker_openshift_prometheus_operator_namespace is defined %}
openshift_prometheus_operator_namespace: "{{ docker_openshift_prometheus_operator_namespace }}"
{% endif %}
{% if docker_openshift_prometheus_operator_image is defined %}
openshift_prometheus_operator_image: "{{ docker_openshift_prometheus_operator_image }}"
{% endif %}
{% if docker_openshift_prometheus_operator_tag is defined %}
openshift_prometheus_operator_tag: "{{ docker_openshift_prometheus_operator_tag }}"
{% endif %}
{% if docker_openshift_prometheus_config_reload_namespace is defined %}
openshift_prometheus_config_reload_namespace: "{{ docker_openshift_prometheus_config_reload_namespace }}"
{% endif %}
{% if docker_openshift_prometheus_config_reload_image is defined %}
openshift_prometheus_config_reload_image: "{{ docker_openshift_prometheus_config_reload_image }}"
{% endif %}
{% if docker_openshift_prometheus_config_reload_tag is defined %}
openshift_prometheus_config_reload_tag: "{{ docker_openshift_prometheus_config_reload_tag }}"
{% endif %}
{% if docker_openshift_prometheus_tag is defined %}
openshift_prometheus_tag: "{{ docker_openshift_prometheus_tag }}"
{% endif %}
{% if docker_openshift_prometheus_alertmanager_tag is defined %}
openshift_prometheus_alertmanager_tag: "{{ docker_openshift_prometheus_alertmanager_tag }}"
{% endif %}
{% if docker_openshift_prometheus_node_exporter_tag is defined %}
openshift_prometheus_node_exporter_tag: "{{ docker_openshift_prometheus_node_exporter_tag }}"
{% endif %}
{% if docker_openshift_oauth_proxy_tag is defined %}
openshift_oauth_proxy_tag: "{{ docker_openshift_oauth_proxy_tag }}"
{% endif %}
{% if docker_openshift_kube_rbac_proxy_namespace is defined %}
openshift_kube_rbac_proxy_namespace: "{{ docker_openshift_kube_rbac_proxy_namespace }}"
{% endif %}
{% if docker_openshift_kube_rbac_proxy_image is defined %}
openshift_kube_rbac_proxy_image: "{{ docker_openshift_kube_rbac_proxy_image }}"
{% endif %}
{% if docker_openshift_kube_rbac_proxy_tag is defined %}
openshift_kube_rbac_proxy_tag: "{{ docker_openshift_kube_rbac_proxy_tag }}"
{% endif %}
{% if docker_openshift_kube_state_metrics_namespace is defined %}
openshift_kube_state_metrics_namespace: "{{ docker_openshift_kube_state_metrics_namespace }}"
{% endif %}
{% if docker_openshift_kube_state_metrics_image is defined %}
openshift_kube_state_metrics_image: "{{ docker_openshift_kube_state_metrics_image }}"
{% endif %}
{% if docker_openshift_kube_state_metrics_tag is defined %}
openshift_kube_state_metrics_tag: "{{ docker_openshift_kube_state_metrics_tag }}"
{% endif %}
{% if docker_openshift_grafana_namespace is defined %}
openshift_grafana_namespace: "{{ docker_openshift_grafana_namespace }}"
{% endif %}
{% if docker_openshift_grafana_tag is defined %}
openshift_grafana_tag: "{{ docker_openshift_grafana_tag }}"
{% endif %}