[release] Synchronise with latest kayobe changes for Yoga
Change-Id: Ie58a441e3d57e476084d2bd611fe7a397d136323
This commit is contained in:
parent
c9eb566463
commit
0780e85a63
@ -328,7 +328,6 @@
|
|||||||
#kolla_enable_horizon_zun:
|
#kolla_enable_horizon_zun:
|
||||||
#kolla_enable_influxdb:
|
#kolla_enable_influxdb:
|
||||||
#kolla_enable_ironic:
|
#kolla_enable_ironic:
|
||||||
#kolla_enable_ironic_ipxe:
|
|
||||||
#kolla_enable_ironic_neutron_agent:
|
#kolla_enable_ironic_neutron_agent:
|
||||||
#kolla_enable_ironic_pxe_uefi:
|
#kolla_enable_ironic_pxe_uefi:
|
||||||
#kolla_enable_iscsid:
|
#kolla_enable_iscsid:
|
||||||
|
@ -11,8 +11,10 @@
|
|||||||
#https_proxy:
|
#https_proxy:
|
||||||
|
|
||||||
# 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", "{{ docker_registry }}"]. This
|
# used. Defaults to ["127.0.0.1", "localhost", "{{ ('http://' ~
|
||||||
# is configured only if either http_proxy or https_proxy is set.
|
# 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:
|
#no_proxy:
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
Loading…
Reference in New Issue
Block a user