openstack/kolla-ansible
Code Issues Proposed changes

Merge "Default neutron_tls_proxy and glance_tls_proxy to haproxy_tag"

Browse Source
This commit is contained in:
Zuul 2023-02-10 14:47:49 +00:00 committed by Gerrit Code Review
commit df12f2ce02
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/glance/defaults/main.yml
View File

@ -141,6 +141,7 @@ haproxy_glance_api_server_timeout: "6h"
#################### ####################
# Docker # Docker
#################### ####################
haproxy_tag: "{{ openstack_tag }}"
glance_tag: "{{ openstack_tag }}" glance_tag: "{{ openstack_tag }}"
glance_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/glance-api" glance_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/glance-api"
@ -148,7 +149,7 @@ glance_api_tag: "{{ glance_tag }}"
glance_api_image_full: "{{ glance_api_image }}:{{ glance_api_tag }}" glance_api_image_full: "{{ glance_api_image }}:{{ glance_api_tag }}"
glance_tls_proxy_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/haproxy" glance_tls_proxy_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/haproxy"
glance_tls_proxy_tag: "{{ glance_tag }}" glance_tls_proxy_tag: "{{ haproxy_tag }}"
glance_tls_proxy_image_full: "{{ glance_tls_proxy_image }}:{{ glance_tls_proxy_tag }}" glance_tls_proxy_image_full: "{{ glance_tls_proxy_image }}:{{ glance_tls_proxy_tag }}"
glance_api_dimensions: "{{ default_container_dimensions }}" glance_api_dimensions: "{{ default_container_dimensions }}"

3
ansible/roles/neutron/defaults/main.yml
View File

@ -249,6 +249,7 @@ neutron_database_shard:
#################### ####################
# Docker # Docker
#################### ####################
haproxy_tag: "{{ openstack_tag }}"
neutron_tag: "{{ openstack_tag }}" neutron_tag: "{{ openstack_tag }}"
neutron_dhcp_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/neutron-dhcp-agent" neutron_dhcp_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/neutron-dhcp-agent"
@ -308,7 +309,7 @@ ironic_neutron_agent_tag: "{{ neutron_tag }}"
ironic_neutron_agent_image_full: "{{ ironic_neutron_agent_image }}:{{ ironic_neutron_agent_tag }}" ironic_neutron_agent_image_full: "{{ ironic_neutron_agent_image }}:{{ ironic_neutron_agent_tag }}"
neutron_tls_proxy_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/haproxy" neutron_tls_proxy_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/haproxy"
neutron_tls_proxy_tag: "{{ neutron_tag }}" neutron_tls_proxy_tag: "{{ haproxy_tag }}"
neutron_tls_proxy_image_full: "{{ neutron_tls_proxy_image }}:{{ neutron_tls_proxy_tag }}" neutron_tls_proxy_image_full: "{{ neutron_tls_proxy_image }}:{{ neutron_tls_proxy_tag }}"
neutron_agent_dimensions: "{{ default_container_dimensions }}" neutron_agent_dimensions: "{{ default_container_dimensions }}"

8
releasenotes/notes/tls-proxies-use-haproxy-tag-aa030b5e5df6fbf0.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
Default tags of ``neutron_tls_proxy`` and ``glance_tls_proxy`` have been
changed to ``haproxy_tag``, as both services are using ``haproxy``
container image.
Any custom tag overrides for those services should be altered before
upgrade.