From b57ec5e4bae20346d554eb8040798ccf498ced00 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 29 Nov 2024 22:46:34 +0100 Subject: [PATCH] Synchronise configuration with master Synchronised with kayobe @ 3c178846a4e40bfc1c5f6f3bed2f5f70bf226cf0. Change-Id: Ia7a5187942feae380f33f218ae7a7382385d7ac3 --- etc/kayobe/openstack.yml | 4 ++-- etc/kayobe/proxy.yml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index fad8d08..1acfd07 100644 --- a/etc/kayobe/openstack.yml +++ b/etc/kayobe/openstack.yml @@ -2,10 +2,10 @@ ############################################################################### # OpenStack release configuration. -# Name of the current OpenStack release. Default is "2024.2". +# Name of the current OpenStack release. Default is "master". #openstack_release: -# Name of the current OpenStack branch. Default is "stable/2024.2". +# Name of the current OpenStack branch. Default is "master". #openstack_branch: ############################################################################### diff --git a/etc/kayobe/proxy.yml b/etc/kayobe/proxy.yml index 714b9da..d7df51e 100644 --- a/etc/kayobe/proxy.yml +++ b/etc/kayobe/proxy.yml @@ -12,8 +12,9 @@ # List of domains, hostnames, IP addresses and networks for which no proxy is # used. Defaults to ["127.0.0.1", "localhost", "{{ ('http://' ~ -# docker_registry) | urlsplit('hostname') }}"] if docker_registry is set, or -# ["127.0.0.1", "localhost"] otherwise. This is configured only if either +# docker_registry) | urlsplit('hostname') }}","{{ kolla_internal_vip_address +# }}"] 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. #no_proxy: