Skip to content

Commit e28ba5c

Browse files
committed
[release] Synchronise with latest kayobe changes for Yoga
Change-Id: I4a2973564350fc8097706929a9eeb79598c7ad05
1 parent 7d449a9 commit e28ba5c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

etc/kayobe/kolla.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@
328328
#kolla_enable_horizon_zun:
329329
#kolla_enable_influxdb:
330330
#kolla_enable_ironic:
331-
#kolla_enable_ironic_ipxe:
332331
#kolla_enable_ironic_neutron_agent:
333332
#kolla_enable_ironic_pxe_uefi:
334333
#kolla_enable_iscsid:

etc/kayobe/proxy.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
#https_proxy:
1212

1313
# List of domains, hostnames, IP addresses and networks for which no proxy is
14-
# used. Defaults to ["127.0.0.1", "localhost", "{{ docker_registry }}"]. This
15-
# is configured only if either http_proxy or https_proxy is set.
14+
# 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
17+
# http_proxy or https_proxy is set.
1618
#no_proxy:
1719

1820
###############################################################################

0 commit comments

Comments
 (0)