Skip to content

Commit 343644c

Browse files
committed
Synchronise configuration with master
Synchronised with kayobe @ 3c178846a4e40bfc1c5f6f3bed2f5f70bf226cf0. Change-Id: Ia2b3399e234016139fadd92b3c583483a064729e
1 parent a9e00ad commit 343644c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

etc/kayobe/openstack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
###############################################################################
33
# OpenStack release configuration.
44

5-
# Name of the current OpenStack release. Default is "2024.2".
5+
# Name of the current OpenStack release. Default is "master".
66
#openstack_release:
77

8-
# Name of the current OpenStack branch. Default is "stable/2024.2".
8+
# Name of the current OpenStack branch. Default is "master".
99
#openstack_branch:
1010

1111
###############################################################################

etc/kayobe/proxy.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212

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

0 commit comments

Comments
 (0)