From 5dcfd0750f810553c173ac8375326d5024d85c73 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 27 Nov 2019 17:09:44 +0000 Subject: [PATCH] docs: Blast final references to nova-network Missed a few. Let's go again. Change-Id: I26368cb59b08f3271d74310d0aa1e36f3d0db5d5 Signed-off-by: Stephen Finucane --- .../admin/configuration/hypervisor-hyper-v.rst | 5 ++++- doc/source/install/compute-install-obs.rst | 17 ----------------- doc/source/install/compute-install-rdo.rst | 17 ----------------- doc/source/install/compute-install-ubuntu.rst | 17 ----------------- doc/source/install/controller-install-obs.rst | 17 ----------------- doc/source/install/controller-install-rdo.rst | 17 ----------------- .../install/controller-install-ubuntu.rst | 17 ----------------- 7 files changed, 4 insertions(+), 103 deletions(-) diff --git a/doc/source/admin/configuration/hypervisor-hyper-v.rst b/doc/source/admin/configuration/hypervisor-hyper-v.rst index 24befafca698..06065aa2a1d3 100644 --- a/doc/source/admin/configuration/hypervisor-hyper-v.rst +++ b/doc/source/admin/configuration/hypervisor-hyper-v.rst @@ -366,9 +366,10 @@ on Hyper-V. Below is a sample ``nova.conf`` for Windows: logfile = nova-compute.log instance_usage_audit = true instance_usage_audit_period = hour - use_neutron = True + [glance] api_servers = http://IP_ADDRESS:9292 + [neutron] endpoint_override = http://IP_ADDRESS:9696 auth_strategy = keystone @@ -377,6 +378,7 @@ on Hyper-V. Below is a sample ``nova.conf`` for Windows: password = Passw0rd auth_url = http://IP_ADDRESS:5000/v3 auth_type = password + [hyperv] vswitch_name = newVSwitch0 limit_cpu_features = false @@ -385,6 +387,7 @@ on Hyper-V. Below is a sample ``nova.conf`` for Windows: config_drive_cdrom = true dynamic_memory_ratio = 1 enable_instance_metrics_collection = true + [rdp] enabled = true html5_proxy_base_url = https://IP_ADDRESS:4430 diff --git a/doc/source/install/compute-install-obs.rst b/doc/source/install/compute-install-obs.rst index 5387b067b229..c5c1d29fb3d8 100644 --- a/doc/source/install/compute-install-obs.rst +++ b/doc/source/install/compute-install-obs.rst @@ -106,23 +106,6 @@ Install and configure components for the first node in the :ref:`example architecture `. - * In the ``[DEFAULT]`` section, enable support for the Networking service: - - .. path /etc/nova/nova.conf - .. code-block:: ini - - [DEFAULT] - # ... - use_neutron = true - firewall_driver = nova.virt.firewall.NoopFirewallDriver - - .. note:: - - By default, Compute uses an internal firewall service. Since - Networking includes a firewall service, you must disable the Compute - firewall service by using the - ``nova.virt.firewall.NoopFirewallDriver`` firewall driver. - * Configure the ``[neutron]`` section of **/etc/nova/nova.conf**. Refer to the :neutron-doc:`Networking service install guide ` for more details. diff --git a/doc/source/install/compute-install-rdo.rst b/doc/source/install/compute-install-rdo.rst index f9327b58c97d..0a5ad685a621 100644 --- a/doc/source/install/compute-install-rdo.rst +++ b/doc/source/install/compute-install-rdo.rst @@ -98,23 +98,6 @@ Install and configure components the first node in the :ref:`example architecture `. - * In the ``[DEFAULT]`` section, enable support for the Networking service: - - .. path /etc/nova/nova.conf - .. code-block:: ini - - [DEFAULT] - # ... - use_neutron = true - firewall_driver = nova.virt.firewall.NoopFirewallDriver - - .. note:: - - By default, Compute uses an internal firewall service. Since Networking - includes a firewall service, you must disable the Compute firewall - service by using the ``nova.virt.firewall.NoopFirewallDriver`` firewall - driver. - * Configure the ``[neutron]`` section of **/etc/nova/nova.conf**. Refer to the :neutron-doc:`Networking service install guide ` diff --git a/doc/source/install/compute-install-ubuntu.rst b/doc/source/install/compute-install-ubuntu.rst index dacca81f03e8..8605c73316ee 100644 --- a/doc/source/install/compute-install-ubuntu.rst +++ b/doc/source/install/compute-install-ubuntu.rst @@ -88,23 +88,6 @@ Install and configure components the first node in the :ref:`example architecture `. - * In the ``[DEFAULT]`` section, enable support for the Networking service: - - .. path /etc/nova/nova.conf - .. code-block:: ini - - [DEFAULT] - # ... - use_neutron = true - firewall_driver = nova.virt.firewall.NoopFirewallDriver - - .. note:: - - By default, Compute uses an internal firewall service. Since Networking - includes a firewall service, you must disable the Compute firewall - service by using the ``nova.virt.firewall.NoopFirewallDriver`` firewall - driver. - * Configure the ``[neutron]`` section of **/etc/nova/nova.conf**. Refer to the :neutron-doc:`Networking service install guide ` diff --git a/doc/source/install/controller-install-obs.rst b/doc/source/install/controller-install-obs.rst index 3a7fe6dcb9ed..1bc082685b23 100644 --- a/doc/source/install/controller-install-obs.rst +++ b/doc/source/install/controller-install-obs.rst @@ -264,23 +264,6 @@ Install and configure components # ... my_ip = 10.0.0.11 - * In the ``[DEFAULT]`` section, enable support for the Networking service: - - .. path /etc/nova/nova.conf - .. code-block:: ini - - [DEFAULT] - # ... - use_neutron = true - firewall_driver = nova.virt.firewall.NoopFirewallDriver - - .. note:: - - By default, Compute uses an internal firewall driver. Since the - Networking service includes a firewall driver, you must disable the - Compute firewall driver by using the - ``nova.virt.firewall.NoopFirewallDriver`` firewall driver. - * Configure the ``[neutron]`` section of **/etc/nova/nova.conf**. Refer to the :neutron-doc:`Networking service install guide ` diff --git a/doc/source/install/controller-install-rdo.rst b/doc/source/install/controller-install-rdo.rst index 467c3566a1c9..321c97eb5ff8 100644 --- a/doc/source/install/controller-install-rdo.rst +++ b/doc/source/install/controller-install-rdo.rst @@ -251,23 +251,6 @@ Install and configure components # ... my_ip = 10.0.0.11 - * In the ``[DEFAULT]`` section, enable support for the Networking service: - - .. path /etc/nova/nova.conf - .. code-block:: ini - - [DEFAULT] - # ... - use_neutron = true - firewall_driver = nova.virt.firewall.NoopFirewallDriver - - .. note:: - - By default, Compute uses an internal firewall driver. Since the - Networking service includes a firewall driver, you must disable the - Compute firewall driver by using the - ``nova.virt.firewall.NoopFirewallDriver`` firewall driver. - * Configure the ``[neutron]`` section of **/etc/nova/nova.conf**. Refer to the :neutron-doc:`Networking service install guide ` for more details. diff --git a/doc/source/install/controller-install-ubuntu.rst b/doc/source/install/controller-install-ubuntu.rst index 6b25c4a18eba..298615809faa 100644 --- a/doc/source/install/controller-install-ubuntu.rst +++ b/doc/source/install/controller-install-ubuntu.rst @@ -241,23 +241,6 @@ Install and configure components # ... my_ip = 10.0.0.11 - * In the ``[DEFAULT]`` section, enable support for the Networking service: - - .. path /etc/nova/nova.conf - .. code-block:: ini - - [DEFAULT] - # ... - use_neutron = true - firewall_driver = nova.virt.firewall.NoopFirewallDriver - - .. note:: - - By default, Compute uses an internal firewall driver. Since the - Networking service includes a firewall driver, you must disable the - Compute firewall driver by using the - ``nova.virt.firewall.NoopFirewallDriver`` firewall driver. - * Configure the ``[neutron]`` section of **/etc/nova/nova.conf**. Refer to the :neutron-doc:`Networking service install guide `