From 78dda3ab8ec9cf84ff8a4d4a90b8925d83224067 Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Tue, 31 Oct 2017 04:47:18 -0400 Subject: [PATCH] Purge doc of references to nova net since support for nova network was removed back in Ocata [1] [2]. Also fix a self-referential link. [1] 0f33dcf62b61547e54011e831f3af939e472e5bc [2] I8b9a559fbea61979f01737ed1dc272276c4f1269 TrivialFix Change-Id: I7f7fdcbf72c2ed38a9141977a0b48dc3fec2f46e --- .../admin/shared-file-systems-network-plugins.rst | 3 --- .../admin/shared-file-systems-share-networks.rst | 11 ----------- doc/source/contributor/architecture.rst | 2 -- .../dhss-true-mode-using-shared-file-systems.rst | 1 - doc/source/user/create-and-manage-shares.rst | 1 - 5 files changed, 18 deletions(-) diff --git a/doc/source/admin/shared-file-systems-network-plugins.rst b/doc/source/admin/shared-file-systems-network-plugins.rst index 5c3394bc02..3c326a5cfc 100644 --- a/doc/source/admin/shared-file-systems-network-plugins.rst +++ b/doc/source/admin/shared-file-systems-network-plugins.rst @@ -84,6 +84,3 @@ Shared File Systems service: of network - flat and segmented. As above, it is completely up to the share driver to support the network type for which the network plug-in is configured. - -More information about network plug-ins can be found in `Manila developer documentation -`_ diff --git a/doc/source/admin/shared-file-systems-share-networks.rst b/doc/source/admin/shared-file-systems-share-networks.rst index 918fc94287..ddbdd33bb4 100644 --- a/doc/source/admin/shared-file-systems-share-networks.rst +++ b/doc/source/admin/shared-file-systems-share-networks.rst @@ -31,16 +31,6 @@ shares are hosted. You can associate a share with a single share network. When you create or update a share, you can optionally specify the ID of a share network through which instances can access the share. -When you create a share network, you can specify only one type of network: - -- OpenStack Networking (neutron). Specify a network ID and subnet ID. - In this case ``manila.network.nova_network_plugin.NeutronNetworkPlugin`` - will be used. - -- Legacy networking (nova-network). Specify a network ID. - In this case ``manila.network.nova_network_plugin.NoveNetworkPlugin`` - will be used. - For more information about supported plug-ins for share networks, see :ref:`shared_file_systems_network_plugins`. @@ -73,7 +63,6 @@ To create a share network with private network and subnetwork, run: | network_type | None | | neutron_net_id | 5ed5a854-21dc-4ed3-870a-117b7064eb21 | | ip_version | None | - | nova_net_id | None | | cidr | None | | project_id | 20787a7ba11946adad976463b57d8a2f | | id | 5c3cbabb-f4da-465f-bc7f-fadbe047b85a | diff --git a/doc/source/contributor/architecture.rst b/doc/source/contributor/architecture.rst index ff369a1c52..856dfd8f20 100644 --- a/doc/source/contributor/architecture.rst +++ b/doc/source/contributor/architecture.rst @@ -58,8 +58,6 @@ Further Challenges * More efficient share/snapshot size calculation * Create a notion of "attached" shares with automation of mount operations -* Support for Nova-network as an alternative to Neutron -* Support for standalone operation (no dependency on Neutron/Nova-network) * Allow admin-created share-servers and share-networks to be used by multiple tenants * Support creation of new subnets for share servers (to connect VLANs with VXLAN/GRE/etc) * Gateway mediated networking model with NFS-Ganesha diff --git a/doc/source/install/common/dhss-true-mode-using-shared-file-systems.rst b/doc/source/install/common/dhss-true-mode-using-shared-file-systems.rst index 94b238c6b3..cd82b0c02d 100644 --- a/doc/source/install/common/dhss-true-mode-using-shared-file-systems.rst +++ b/doc/source/install/common/dhss-true-mode-using-shared-file-systems.rst @@ -137,7 +137,6 @@ server is an instance where NFS shares are served. | network_type | None | | neutron_net_id | 7c6f9b37-76b4-463e-98d8-27e5686ed083 | | ip_version | None | - | nova_net_id | None | | cidr | None | | project_id | e2c965830ecc4162a002bf16ddc91ab7 | | id | 58b2f0e6-5509-4830-af9c-97f525a31b14 | diff --git a/doc/source/user/create-and-manage-shares.rst b/doc/source/user/create-and-manage-shares.rst index 68dfc27568..0f1c6ff819 100644 --- a/doc/source/user/create-and-manage-shares.rst +++ b/doc/source/user/create-and-manage-shares.rst @@ -30,7 +30,6 @@ Create a share network | network_type | None | | neutron_net_id | dca0efc7-523d-43ef-9ded-af404a02b055 | | ip_version | None | - | nova_net_id | None | | cidr | None | | project_id | 907004508ef4447397ce6741a8f037c1 | | id | c895fe26-92be-4152-9e6c-f2ad230efb13 |