Merge "Synchronise configuration with master"

This commit is contained in:
Zuul 2024-12-11 17:46:23 +00:00 committed by Gerrit Code Review
commit fabad9af3d
2 changed files with 5 additions and 4 deletions

View File

@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "2024.2". # Name of the current OpenStack release. Default is "master".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "stable/2024.2". # Name of the current OpenStack branch. Default is "master".
#openstack_branch: #openstack_branch:
############################################################################### ###############################################################################

View File

@ -12,8 +12,9 @@
# List of domains, hostnames, IP addresses and networks for which no proxy is # List of domains, hostnames, IP addresses and networks for which no proxy is
# used. Defaults to ["127.0.0.1", "localhost", "{{ ('http://' ~ # used. Defaults to ["127.0.0.1", "localhost", "{{ ('http://' ~
# docker_registry) | urlsplit('hostname') }}"] if docker_registry is set, or # docker_registry) | urlsplit('hostname') }}","{{ kolla_internal_vip_address
# ["127.0.0.1", "localhost"] otherwise. This is configured only if either # }}"] if docker_registry is set, or ["127.0.0.1", "localhost","{{
# kolla_internal_vip_address }}"] otherwise. This is configured only if either
# http_proxy or https_proxy is set. # http_proxy or https_proxy is set.
#no_proxy: #no_proxy: