From c2ccf572d690e08e2a6747aa0d35b41a200a9eb0 Mon Sep 17 00:00:00 2001
From: Dave McCowan <dmccowan@cisco.com>
Date: Tue, 12 Apr 2016 16:27:56 -0400
Subject: [PATCH] Remove Disable HAProxy option from Quick Start Guide
The disable HAProxy option is not commonly used and not
recommended. This patch moves the section that describes it
out of the Quick Start Guide and into the Advanced Configuration
Guide.
Change-Id: Iccd8a6369d772bd85f304cba0a99300180a369c8
Closes-Bug: #1569560
---
doc/advanced-configuration.rst | 14 ++++++++++++++
doc/quickstart.rst | 12 ------------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/doc/advanced-configuration.rst b/doc/advanced-configuration.rst
index 6fe857fb25..5827852bd6 100644
--- a/doc/advanced-configuration.rst
+++ b/doc/advanced-configuration.rst
@@ -134,3 +134,17 @@ TODO(all) fill this section out
OpenStack Service Configuration in Kolla
----------------------------------------
TODO(all) fill this section out
+
+IP Address Constrained Environments
+-----------------------------------
+If a development environment doesn't have a free IP address available for VIP
+configuration, the host's IP address may be used here by disabling HAProxy by
+adding:
+
+::
+
+ enable_haproxy: "no"
+
+Note this method is not recommended and generally not tested by the
+Kolla community, but included since sometimes a free IP is not available
+in a testing environment.
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index e3f2a922b9..e9ef4c7acf 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -453,18 +453,6 @@ added to the "api\_interface" as specified in the globals.yml
kolla_internal_vip_address: "10.10.10.254"
-If the environment doesn't have a free IP address available for VIP
-configuration, the host's IP address may be used here by disabling HAProxy by
-adding:
-
-::
-
- enable_haproxy: "no"
-
-Note this method is not recommended and generally not tested by the
-Kolla community, but included since sometimes a free IP is not available
-in a testing environment.
-
The "network\_interface" variable is the interface to which Kolla binds API
services. For example, when starting up Mariadb it will bind to the
IP on the interface list in the "network\_interface" variable.
--
GitLab