From de695f04db8ba729b32b9ffa19d7f5e7ead615ec Mon Sep 17 00:00:00 2001 From: MD NADEEM Date: Fri, 18 Mar 2016 10:26:59 +0530 Subject: [PATCH] Fix inconsistancy in globals.yml The parameter values in global.yml were inconsist, for some variable default values are shown while for others it's not. From user point of view it is important to know the default values of the parameters and the globals.yml is the file where user is supposed to look for config variable, for sure a user do not want to look kolla/ansible/group_var/all.yml file just for checking default values. So it is better to show all default values in global.yml This patch will solve this issue. TrivialFix Change-Id: I991fc5e1d4ed48d106da002a0f18a2b31525a482 --- etc/kolla/globals.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 36fa91a8c5..ec2612690a 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -1,6 +1,8 @@ --- # You can use this file to override _any_ variable throughout Kolla. -# Additional options can be found in the 'kolla/group_vars/all.yml' file. +# Additional options can be found in the 'kolla/ansible/group_vars/all.yml' file. +# Default value of all the commented parameters are shown here, To override +# the default value uncomment the parameter and change its value. ################### # Kolla options @@ -77,8 +79,8 @@ neutron_external_interface: "eth1" #################### # To provide encryption and authentication on the kolla_external_vip_interface, # TLS can be enabled. When TLS is enabled, certificates must be provided to -# allow clients to perform authentication. The default is TLS disabled. -#kolla_enable_tls_external: "yes" +# allow clients to perform authentication. +#kolla_enable_tls_external: "no" #kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem" @@ -86,16 +88,17 @@ neutron_external_interface: "eth1" # OpenStack options #################### # Use these options to set the various log levels across all OpenStack projects +# Valid options are [ True, False ] #openstack_logging_debug: "False" # Valid options are [ novnc, spice ] #nova_console: "novnc" # OpenStack services can be enabled or disabled with these options -#enable_cinder: "yes" -#enable_heat: "no" +#enable_cinder: "no" +#enable_heat: "yes" #enable_magnum: "no" -#enable_swift: "yes" +#enable_swift: "no" ###################