Merge "Comment out all variables in globals.yml"

This commit is contained in:
Zuul 2019-06-18 12:19:10 +00:00 committed by Gerrit Code Review
commit 2fd984544d

View File

@ -28,7 +28,7 @@
# All-In-One without haproxy and keepalived, you can set enable_haproxy to no # 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 # in "OpenStack options" section, and set this value to the IP of your
# 'network_interface' as set in the Networking section below. # '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 # 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. # 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_swift: "no"
#glance_backend_vmware: "no" #glance_backend_vmware: "no"
#enable_glance_image_cache: "no" #enable_glance_image_cache: "no"
# Configure glance upgrade option, due to this feature is experimental # Configure glance upgrade option.
# in glance, so default value should be set to "no". # Due to this feature being experimental in glance,
glance_enable_rolling_upgrade: "no" # the default value is "no".
#glance_enable_rolling_upgrade: "no"
#################### ####################
# Osprofiler options # Osprofiler options
@ -468,9 +469,9 @@ glance_enable_rolling_upgrade: "no"
############################# #############################
# dnsmasq bind interface for Ironic Inspector, by default is network_interface # dnsmasq bind interface for Ironic Inspector, by default is network_interface
#ironic_dnsmasq_interface: "{{ network_interface }}" #ironic_dnsmasq_interface: "{{ network_interface }}"
# following value must be set when enable ironic, the value format # The following value must be set when enabling ironic,
# is "192.168.0.10,192.168.0.100". # the value format is "192.168.0.10,192.168.0.100".
ironic_dnsmasq_dhcp_range: #ironic_dnsmasq_dhcp_range:
# PXE bootloader file for Ironic Inspector, relative to /tftpboot. # PXE bootloader file for Ironic Inspector, relative to /tftpboot.
#ironic_dnsmasq_boot_file: "pxelinux.0" #ironic_dnsmasq_boot_file: "pxelinux.0"
@ -524,11 +525,11 @@ ironic_dnsmasq_dhcp_range:
################################################ ################################################
# Tempest - The OpenStack Integration Test Suite # Tempest - The OpenStack Integration Test Suite
################################################ ################################################
# following value must be set when enable tempest # The following values must be set when enabling tempest
tempest_image_id: #tempest_image_id:
tempest_flavor_ref_id: #tempest_flavor_ref_id:
tempest_public_network_id: #tempest_public_network_id:
tempest_floating_network_name: #tempest_floating_network_name:
# tempest_image_alt_id: "{{ tempest_image_id }}" # tempest_image_alt_id: "{{ tempest_image_id }}"
# tempest_flavor_ref_alt_id: "{{ tempest_flavor_ref_id }}" # tempest_flavor_ref_alt_id: "{{ tempest_flavor_ref_id }}"