Merge "Add enable_haproxy to globals.yml"

etc/kolla/globals.yml

@@ -24,8 +24,9 @@
 #node_custom_config: "/etc/kolla/config"
 
 # This should be a VIP, an unused IP on your network that will float between
-# the hosts running keepalived for high-availability. When running an All-In-One
-# without haproxy and keepalived, this should be the first IP on your
+# the hosts running keepalived for high-availability. If you want to run an
+# All-In-One without haproxy and keepalived, you can set enable_haproxy to no
+# in "OpenStack options" section, and set this value to the first IP on your
 # 'network_interface' as set in the Networking section below.
 kolla_internal_vip_address: "10.10.10.254"
 
@@ -147,6 +148,7 @@ kolla_internal_vip_address: "10.10.10.254"
 #enable_freezer: "no"
 #enable_gnocchi: "no"
 #enable_grafana: "no"
+#enable_haproxy: "yes"
 #enable_heat: "yes"
 #enable_horizon: "yes"
 #enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}"