From 0780e85a632d3ffbff2917e211a908d9952cec2e Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 27 Apr 2022 12:42:03 +0200 Subject: [PATCH] [release] Synchronise with latest kayobe changes for Yoga Change-Id: Ie58a441e3d57e476084d2bd611fe7a397d136323 --- etc/kayobe/kolla.yml | 1 - etc/kayobe/proxy.yml | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index e2e155f..488ce10 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -328,7 +328,6 @@ #kolla_enable_horizon_zun: #kolla_enable_influxdb: #kolla_enable_ironic: -#kolla_enable_ironic_ipxe: #kolla_enable_ironic_neutron_agent: #kolla_enable_ironic_pxe_uefi: #kolla_enable_iscsid: diff --git a/etc/kayobe/proxy.yml b/etc/kayobe/proxy.yml index 7d63017..714b9da 100644 --- a/etc/kayobe/proxy.yml +++ b/etc/kayobe/proxy.yml @@ -11,8 +11,10 @@ #https_proxy: # List of domains, hostnames, IP addresses and networks for which no proxy is -# used. Defaults to ["127.0.0.1", "localhost", "{{ docker_registry }}"]. This -# is configured only if either http_proxy or https_proxy is set. +# 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 +# http_proxy or https_proxy is set. #no_proxy: ###############################################################################