From cfd1852786e905ab7b1303d8d5fb4c6858ec07a6 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 8 Mar 2016 08:01:50 -0500 Subject: [PATCH] Update manuals to use new ``use_neutron`` option Starting in Mitaka there is a unified use_neutron option that enables both the network api and security group api. This is prefered over the class based options which are now deprecated. Change-Id: I3b682a1482f406e16cefa05b3a25d5cb2798097f --- .../source/networking_config-identity.rst | 10 +++------- .../source/networking_multi-dhcp-agents.rst | 2 +- .../source/compute/hypervisor-hyper-v.rst | 2 +- doc/install-guide/source/nova-compute-install.rst | 3 +-- doc/install-guide/source/nova-controller-install.rst | 3 +-- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/doc/admin-guide-cloud/source/networking_config-identity.rst b/doc/admin-guide-cloud/source/networking_config-identity.rst index 0da8da858e..c0a5134572 100644 --- a/doc/admin-guide-cloud/source/networking_config-identity.rst +++ b/doc/admin-guide-cloud/source/networking_config-identity.rst @@ -165,8 +165,8 @@ happen, you must configure the following items in the ``nova.conf`` file * - Attribute name - Required - * - ``[DEFAULT] network_api_class`` - - Modify from the default to ``nova.network.neutronv2.api.API``, to + * - ``[DEFAULT] use_neutron`` + - Modify from the default to ``True`` to indicate that Networking should be used rather than the traditional nova-network networking model. * - ``[neutron] url`` @@ -210,9 +210,6 @@ values in the ``nova.conf`` file: | | so that nova-compute does not perform | | | iptables-based filtering itself. | +-----------------------+-----------------------------------------------------+ -| ``security_group_api``| Update to ``neutron``, so that all security group | -| | requests are proxied to the Network Service. | -+-----------------------+-----------------------------------------------------+ Configure metadata ~~~~~~~~~~~~~~~~~~ @@ -266,8 +263,7 @@ running Compute and Networking with an IP address of 192.168.1.2: .. code-block:: ini [DEFAULT] - security_group_api=neutron - network_api_class=nova.network.neutronv2.api.API + use_neutron = True firewall_driver=nova.virt.firewall.NoopFirewallDriver [neutron] diff --git a/doc/admin-guide-cloud/source/networking_multi-dhcp-agents.rst b/doc/admin-guide-cloud/source/networking_multi-dhcp-agents.rst index e990623cf7..921df73fc9 100644 --- a/doc/admin-guide-cloud/source/networking_multi-dhcp-agents.rst +++ b/doc/admin-guide-cloud/source/networking_multi-dhcp-agents.rst @@ -111,7 +111,7 @@ Configuration .. code-block:: ini [DEFAULT] - network_api_class=nova.network.neutronv2.api.API + use_neutron=True firewall_driver=nova.virt.firewall.NoopFirewallDriver [neutron] diff --git a/doc/config-reference/source/compute/hypervisor-hyper-v.rst b/doc/config-reference/source/compute/hypervisor-hyper-v.rst index 0f7f138056..1fc3da7277 100644 --- a/doc/config-reference/source/compute/hypervisor-hyper-v.rst +++ b/doc/config-reference/source/compute/hypervisor-hyper-v.rst @@ -358,7 +358,7 @@ OpenStack on Hyper-V. Below is a sample ``nova.conf`` for Windows: logfile = nova-compute.log instance_usage_audit = true instance_usage_audit_period = hour - network_api_class = nova.network.neutronv2.api.API + use_neutron = True [neutron] url = http://IP_ADDRESS:9696 auth_strategy = keystone diff --git a/doc/install-guide/source/nova-compute-install.rst b/doc/install-guide/source/nova-compute-install.rst index bfd81eee20..9567fd1c8b 100644 --- a/doc/install-guide/source/nova-compute-install.rst +++ b/doc/install-guide/source/nova-compute-install.rst @@ -149,8 +149,7 @@ Install and configure components [DEFAULT] ... - network_api_class = nova.network.neutronv2.api.API - security_group_api = neutron + use_neutron = True firewall_driver = nova.virt.firewall.NoopFirewallDriver .. note:: diff --git a/doc/install-guide/source/nova-controller-install.rst b/doc/install-guide/source/nova-controller-install.rst index df9701db72..1998110070 100644 --- a/doc/install-guide/source/nova-controller-install.rst +++ b/doc/install-guide/source/nova-controller-install.rst @@ -311,8 +311,7 @@ Install and configure components [DEFAULT] ... - network_api_class = nova.network.neutronv2.api.API - security_group_api = neutron + use_neutron = True firewall_driver = nova.virt.firewall.NoopFirewallDriver .. note::