From 5afd4fcab515a88bd3789325d3b130c3685f6fdf Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Thu, 24 Jul 2014 18:43:59 +0200 Subject: [PATCH] Mark floating-IP auto-assignment as disabled also with Neutron Neutron does not implement the feature right now, so using Neutron is like using Nove-Network with auto-assignment disabled. See the Neutron spec at: https://blueprints.launchpad.net/neutron/+spec/auto-associate-floating-ip Change-Id: If8bbd8adb69bf03649f6c61a6bc9f560a9913fbc --- doc/source/horizon/dev.environment.guide.rst | 2 +- doc/source/horizon/installation.guide.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/horizon/dev.environment.guide.rst b/doc/source/horizon/dev.environment.guide.rst index c7ffa05a..9c8e358c 100644 --- a/doc/source/horizon/dev.environment.guide.rst +++ b/doc/source/horizon/dev.environment.guide.rst @@ -93,7 +93,7 @@ using the following command: SAHARA_USE_NEUTRON = True .. - If you are using Nova-Network with ``auto_assign_floating_ip=False`` add + If you are using Nova-Network with ``auto_assign_floating_ip=False`` or Neutron add the following parameter: .. sourcecode:: python diff --git a/doc/source/horizon/installation.guide.rst b/doc/source/horizon/installation.guide.rst index c9d36856..1a47ef18 100644 --- a/doc/source/horizon/installation.guide.rst +++ b/doc/source/horizon/installation.guide.rst @@ -79,7 +79,7 @@ approach see :doc:`/horizon/dev.environment.guide` SAHARA_USE_NEUTRON = True .. - If you are using Nova-Network with ``auto_assign_floating_ip=False`` add + If you are using Nova-Network with ``auto_assign_floating_ip=False`` or Neutron add the following parameter: .. sourcecode:: python