diff --git a/doc/source/admin/config-ml2.rst b/doc/source/admin/config-ml2.rst index 5725f224412..6a121f5dfb4 100644 --- a/doc/source/admin/config-ml2.rst +++ b/doc/source/admin/config-ml2.rst @@ -105,7 +105,7 @@ To enable type drivers in the ML2 plug-in. Edit the For more details，see the `Bug 1567792 `__. For more details, see the -`Networking configuration options `__ +`Networking configuration options <../configuration/ml2-conf.html>`__ of Configuration Reference. The following type drivers are available @@ -133,14 +133,14 @@ More information about provider networks see The administrator needs to configure a list of physical network names that can be used for provider networks. For more details, see the related section in the - `Configuration Reference `__. + `Configuration Reference <../configuration/ml2-conf.html#ml2-type-flat>`__. * VLAN The administrator needs to configure a list of physical network names that can be used for provider networks. For more details, see the related section in the - `Configuration Reference `__. + `Configuration Reference <../configuration/ml2-conf.html#ml2-type-vlan>`__. * GRE @@ -180,21 +180,21 @@ server: The administrator needs to configure the range of VLAN IDs that can be used for project network allocation. For more details, see the related section in the - `Configuration Reference `__. + `Configuration Reference <../configuration/ml2-conf.html#ml2-type-vlan>`__. * GRE The administrator needs to configure the range of tunnel IDs that can be used for project network allocation. For more details, see the related section in the - `Configuration Reference `__. + `Configuration Reference <../configuration/ml2-conf.html#ml2-type-gre>`__. * VXLAN The administrator needs to configure the range of VXLAN IDs that can be used for project network allocation. For more details, see the related section in the - `Configuration Reference `__. + `Configuration Reference <../configuration/ml2-conf.html#ml2-type-vxlan>`__. .. note:: Flat networks for project allocation are not supported. They only @@ -216,7 +216,7 @@ To enable mechanism drivers in the ML2 plug-in, edit the For more details, see the `Bug 1567792 `__. For more details, see the -`Configuration Reference `__. +`Configuration Reference <../configuration/ml2-conf.html#ml2>`__. * Linux bridge @@ -232,9 +232,7 @@ For more details, see the * SRIOV - The administrator needs to define a list PCI hardware that shall be used - by OpenStack. For more details, see the related section in the - `Configuration Reference `__. + The SRIOV driver accepts all PCI vendor devices. * MacVTap @@ -273,7 +271,7 @@ The ML2 plug-in also supports extension drivers that allows other pluggable drivers to extend the core resources implemented in the ML2 plug-in (``networks``, ``ports``, etc.). Examples of extension drivers include support for QoS, port security, etc. For more details see the ``extension_drivers`` -configuration option in the `Configuration Reference `__. +configuration option in the `Configuration Reference <../configuration/ml2-conf.html#ml2.extension_drivers>`__. Agents @@ -295,7 +293,7 @@ resources. It typically runs on each Network Node and on each Compute Node. you pass this configuration file as argument. For a detailed list of configuration options, see the related section in the - `Configuration Reference `__. + `Configuration Reference <../configuration/openvswitch-agent.html>`__. * Linux bridge agent @@ -307,7 +305,7 @@ resources. It typically runs on each Network Node and on each Compute Node. you pass this configuration file as argument. For a detailed list of configuration options, see the related section in the - `Configuration Reference `__. + `Configuration Reference <../configuration/linuxbridge-agent.html>`__. * SRIOV Nic Switch agent @@ -320,7 +318,7 @@ resources. It typically runs on each Network Node and on each Compute Node. you pass this configuration file as argument. For a detailed list of configuration options, see the related section in the - `Configuration Reference `__. + `Configuration Reference <../configuration/sriov-agent.html>`__. * MacVTap agent @@ -333,7 +331,7 @@ resources. It typically runs on each Network Node and on each Compute Node. you pass this configuration file as argument. For a detailed list of configuration options, see the related section in the - `Configuration Reference `__. + `Configuration Reference <../configuration/macvtap-agent.html>`__. L3 agent ^^^^^^^^ @@ -346,7 +344,7 @@ Configuration for the L3 agent is typically done in the you pass this configuration file as argument. For a detailed list of configuration options, see the related section in the -`Configuration Reference `__. +`Configuration Reference <../configuration/l3-agent.html>`__. DHCP agent ^^^^^^^^^^ @@ -360,7 +358,7 @@ Configuration for the DHCP agent is typically done in the you pass this configuration file as argument. For a detailed list of configuration options, see the related section in the -`Configuration Reference `__. +`Configuration Reference <../configuration/dhcp-agent.html>`__. Metadata agent ^^^^^^^^^^^^^^ @@ -373,7 +371,7 @@ Configuration for the Metadata agent is typically done in the you pass this configuration file as argument. For a detailed list of configuration options, see the related section in the -`Configuration Reference `__. +`Configuration Reference <../configuration/metadata-agent.html>`__. L3 metering agent ^^^^^^^^^^^^^^^^^ @@ -386,7 +384,7 @@ Configuration for the L3 metering agent is typically done in the you pass this configuration file as argument. For a detailed list of configuration options, see the related section in the -`Configuration Reference `__. +`Configuration Reference <../configuration/metering-agent.html>`__. Security -------- @@ -396,7 +394,7 @@ L2 agents support some important security configurations. * Security Groups For more details, see the related section in the - `Configuration Reference `__. + `Configuration Reference <../configuration/ml2-conf.html#securitygroup>`__. * Arp Spoofing Prevention diff --git a/doc/source/admin/config.rst b/doc/source/admin/config.rst index dd3d3a411d9..bd127a2e074 100644 --- a/doc/source/admin/config.rst +++ b/doc/source/admin/config.rst @@ -36,4 +36,4 @@ Configuration .. note:: For general configuration, see the `Configuration Reference - `_. + <../configuration/>`_. diff --git a/doc/source/admin/deploy-lb-provider.rst b/doc/source/admin/deploy-lb-provider.rst index ec4f60da5b3..d9cbc7f3943 100644 --- a/doc/source/admin/deploy-lb-provider.rst +++ b/doc/source/admin/deploy-lb-provider.rst @@ -83,7 +83,7 @@ Controller node * Disable service plug-ins because provider networks do not require any. However, this breaks portions of the dashboard that manage the Networking service. See the - `Ocata Install Tutorials and Guides `__ + `Pike Install Tutorials and Guides <../install/>`__ for more information. .. code-block:: ini diff --git a/doc/source/admin/deploy-ovs-provider.rst b/doc/source/admin/deploy-ovs-provider.rst index 9fa4cc78dff..ac9543c70d1 100644 --- a/doc/source/admin/deploy-ovs-provider.rst +++ b/doc/source/admin/deploy-ovs-provider.rst @@ -94,8 +94,8 @@ Controller node * Disable service plug-ins because provider networks do not require any. However, this breaks portions of the dashboard that manage the Networking service. See the - `Ocata Install Tutorials and Guides - `__ for more + `Pike Install Tutorials and Guides + <../install/>`__ for more information. .. code-block:: ini diff --git a/doc/source/admin/deploy.rst b/doc/source/admin/deploy.rst index 06640a61ab9..620e1f9c03c 100644 --- a/doc/source/admin/deploy.rst +++ b/doc/source/admin/deploy.rst @@ -38,7 +38,7 @@ total of five nodes. Each building block could also require additional infrastructure or changes to existing infrastructure such as networks. For basic configuration of prerequisites, see the -`Ocata Install Tutorials and Guides `__. +`Pike Install Tutorials and Guides <../install/>`__. .. note:: diff --git a/doc/source/admin/fwaas.rst b/doc/source/admin/fwaas.rst index 9ece4849aec..d9f02d1447c 100644 --- a/doc/source/admin/fwaas.rst +++ b/doc/source/admin/fwaas.rst @@ -66,6 +66,5 @@ effect this. \*\* This feature is planned for Ocata. For further information, see `v1 configuration guide -`_ or -`v2 configuration guide -`_. +<./fwaas-v1-scenario.html>`_ or +`v2 configuration guide <./fwaas-v2-scenario.html>`_. diff --git a/doc/source/contributor/stadium/governance.rst b/doc/source/contributor/stadium/governance.rst index 3b55727691f..1584c08021b 100644 --- a/doc/source/contributor/stadium/governance.rst +++ b/doc/source/contributor/stadium/governance.rst @@ -265,7 +265,7 @@ Checklist For release documentation related to Neutron, please check the :doc:`/contributor/policies/index`. Once, everything is set up and your project is released, make sure - you see an entry on the release page (e.g. `Ocata `_. + you see an entry on the release page (e.g. `Pike `_. Make sure you release according to the project declared release `model `_. diff --git a/doc/source/feature_classification/general_feature_support_matrix.ini b/doc/source/feature_classification/general_feature_support_matrix.ini index 58c4ace5053..e84262d0380 100644 --- a/doc/source/feature_classification/general_feature_support_matrix.ini +++ b/doc/source/feature_classification/general_feature_support_matrix.ini @@ -164,7 +164,7 @@ title=DNS status=mature api=dns-integration notes=The ability to integrate with an external DNS - as a Service. http://docs.openstack.org/ocata/networking-guide/config-dns-int.html + as a Service. http://docs.openstack.org/pike/networking-guide/config-dns-int.html networking-ovs=complete networking-linux-bridge=complete networking-odl=complete