diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 09:23:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 09:23:56 +0000 |
| commit | 3a35abe4a1c64f1a3a35ba1370060228f7e8be1a (patch) | |
| tree | 84733cb06bfd1bd869705019f7eb25222d300a27 | |
| parent | 030619535e07fb2683153d9e998ea0bfb7394844 (diff) | |
| parent | c2ccf572d690e08e2a6747aa0d35b41a200a9eb0 (diff) | |
| download | kolla-3a35abe4a1c64f1a3a35ba1370060228f7e8be1a.tar.gz kolla-3a35abe4a1c64f1a3a35ba1370060228f7e8be1a.zip | |
Merge "Remove Disable HAProxy option from Quick Start Guide"
| -rw-r--r-- | doc/advanced-configuration.rst | 14 | ||||
| -rw-r--r-- | doc/quickstart.rst | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/doc/advanced-configuration.rst b/doc/advanced-configuration.rst index 6fe857fb2..5827852bd 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 e3f2a922b..e9ef4c7ac 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. |