From 16e58a463a288ffb2e28fa62eabec65dd803e05f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Sun, 16 Jun 2019 10:53:58 +0200 Subject: [PATCH] Comment out all variables in globals.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To be consistent. Also fix surrounding comments. Change-Id: Id1a65ab3379ca76192e9291f941b9b675a05ff09 Signed-off-by: Radosław Piliszek --- etc/kolla/globals.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index cdfea0930b..0e86f942b2 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -28,7 +28,7 @@ # All-In-One without haproxy and keepalived, you can set enable_haproxy to no # in "OpenStack options" section, and set this value to the IP of your # 'network_interface' as set in the Networking section below. -kolla_internal_vip_address: "10.10.10.254" +#kolla_internal_vip_address: "10.10.10.254" # This is the DNS name that maps to the kolla_internal_vip_address VIP. By # default it is the same as kolla_internal_vip_address. @@ -369,9 +369,10 @@ kolla_internal_vip_address: "10.10.10.254" #glance_backend_swift: "no" #glance_backend_vmware: "no" #enable_glance_image_cache: "no" -# Configure glance upgrade option, due to this feature is experimental -# in glance, so default value should be set to "no". -glance_enable_rolling_upgrade: "no" +# Configure glance upgrade option. +# Due to this feature being experimental in glance, +# the default value is "no". +#glance_enable_rolling_upgrade: "no" #################### # Osprofiler options @@ -468,9 +469,9 @@ glance_enable_rolling_upgrade: "no" ############################# # dnsmasq bind interface for Ironic Inspector, by default is network_interface #ironic_dnsmasq_interface: "{{ network_interface }}" -# following value must be set when enable ironic, the value format -# is "192.168.0.10,192.168.0.100". -ironic_dnsmasq_dhcp_range: +# The following value must be set when enabling ironic, +# the value format is "192.168.0.10,192.168.0.100". +#ironic_dnsmasq_dhcp_range: # PXE bootloader file for Ironic Inspector, relative to /tftpboot. #ironic_dnsmasq_boot_file: "pxelinux.0" @@ -524,11 +525,11 @@ ironic_dnsmasq_dhcp_range: ################################################ # Tempest - The OpenStack Integration Test Suite ################################################ -# following value must be set when enable tempest -tempest_image_id: -tempest_flavor_ref_id: -tempest_public_network_id: -tempest_floating_network_name: +# The following values must be set when enabling tempest +#tempest_image_id: +#tempest_flavor_ref_id: +#tempest_public_network_id: +#tempest_floating_network_name: # tempest_image_alt_id: "{{ tempest_image_id }}" # tempest_flavor_ref_alt_id: "{{ tempest_flavor_ref_id }}"