diff --git a/doc/source/datanet/kubernetes/adding-data-networks-using-the-cli.rst b/doc/source/datanet/kubernetes/adding-data-networks-using-the-cli.rst index 3b20c13d5..a9be4d3bb 100644 --- a/doc/source/datanet/kubernetes/adding-data-networks-using-the-cli.rst +++ b/doc/source/datanet/kubernetes/adding-data-networks-using-the-cli.rst @@ -6,17 +6,10 @@ Add Data Networks Using the CLI =============================== -If you prefer, you can add data networks using the CLI. You can set up flat, -VLAN and VXLAN data networks over physical networks using the **controller-0** -command-line interface. The data networks provide connectivity for project -networks. - -.. rubric:: |prereq| - - -.. _adding-data-networks-using-the-cli-prereq-controller-0-ready: - -Controller-0 must be installed and configured. +You can add data networks using the CLI. You can set up flat, VLAN and VXLAN +data networks over physical networks using the command-line interface. The data +networks model the L2 networks that are attached to node data, pci-sriov and +pci-passthrough interface. .. rubric:: |proc| @@ -81,8 +74,6 @@ Controller-0 must be installed and configured. | description | None | +--------------+--------------------------------------+ - You must configure at least one data network in order to assign data - interfaces to worker nodes and unlock the hosts. .. rubric:: |postreq| diff --git a/doc/source/datanet/kubernetes/assigning-a-data-network-to-an-interface.rst b/doc/source/datanet/kubernetes/assigning-a-data-network-to-an-interface.rst index 4bc33af2a..c4fdd749b 100644 --- a/doc/source/datanet/kubernetes/assigning-a-data-network-to-an-interface.rst +++ b/doc/source/datanet/kubernetes/assigning-a-data-network-to-an-interface.rst @@ -7,10 +7,10 @@ Assign a Data Network to an Interface ===================================== In order to associate the L2 Network definition of a Data Network with a -physical network, the Data Network must be mapped to an Ethernet or Aggregated -Ethernet interface on a compute node. +physical network, the Data Network must be mapped to an interface on a host. The command for performing the mapping has the format: -:command:`system interface‐datanetwork‐assign` - \ No newline at end of file +.. code-block:: none + + ~(keystone_admin)]$ system interface‐datanetwork‐assign \ No newline at end of file diff --git a/doc/source/datanet/kubernetes/data-network-management-data-networks.rst b/doc/source/datanet/kubernetes/data-network-management-data-networks.rst index bc97063e7..c708fc54f 100644 --- a/doc/source/datanet/kubernetes/data-network-management-data-networks.rst +++ b/doc/source/datanet/kubernetes/data-network-management-data-networks.rst @@ -34,9 +34,6 @@ created: .. note:: This data interface is ONLY applicable to the |prod-os| application. - Static VXLAN is limited to one data network, and if configured, it must - be enabled on all openstack-compute labeled nodes. - A data network implemented across non-contiguous physical networks connected by Layer 3 routers, using a VNI identifier. This allows multiple data networks over physically separated Layer 2 networks. diff --git a/doc/source/datanet/kubernetes/displaying-data-network-information-using-horizon.rst b/doc/source/datanet/kubernetes/displaying-data-network-information-using-horizon.rst index 1d3e8d949..d7e5bbfd0 100644 --- a/doc/source/datanet/kubernetes/displaying-data-network-information-using-horizon.rst +++ b/doc/source/datanet/kubernetes/displaying-data-network-information-using-horizon.rst @@ -6,29 +6,11 @@ Display Data Network Information Using Horizon ============================================== -You can view data network details from the Horizon Web interface or the CLI. -You can also view data network topologies from Horizon. - .. rubric:: |context| Using Horizon, you can obtain information about data networks using the following: -The **Data Network Topology** view. This is a graphical representation of all -data networks on the system and their connections to worker hosts. You can -select individual data networks to view details. You can also review active -alarms for data network connections. - -.. For more information, see :ref:`The Data Network Topology View `. - -.. note:: - You cannot make changes from this view. - -Both places use the **Data Network Details** tab to present details. If you -prefer, you can view the details using the CLI; for more information, see -:ref:`Displaying Data Network Information Using the CLI -`. - .. rubric:: |proc| #. From the left pane menu, select **Admin** \> **Platform** \> **Data @@ -37,4 +19,8 @@ prefer, you can view the details using the CLI; for more information, see #. Click the name of the data network to open the Data Network Overview page. Details for the data network are displayed and, in the case of |prod-os|, - the project networks. \ No newline at end of file + the project networks. + +.. note:: + You can view data network topologies from Horizon, see :ref:`Data Network + Topology View `. \ No newline at end of file diff --git a/doc/source/datanet/kubernetes/index.rst b/doc/source/datanet/kubernetes/index.rst index 6d5b2e5c4..4c9b6269f 100644 --- a/doc/source/datanet/kubernetes/index.rst +++ b/doc/source/datanet/kubernetes/index.rst @@ -3,13 +3,14 @@ .. _datanet_kubernetes_index: ======== -Contents +Overview ======== .. toctree:: :maxdepth: 1 data-network-management-data-networks + vxlan-data-networks -------------------------------- Display data network information @@ -21,7 +22,6 @@ Display data network information displaying-data-network-information-using-horizon displaying-data-network-information-using-the-cli the-data-network-topology-view - vxlan-data-networks ------------------------------------- Add, assign, and remove data networks diff --git a/doc/source/datanet/kubernetes/removing-a-data-network-using-the-cli.rst b/doc/source/datanet/kubernetes/removing-a-data-network-using-the-cli.rst index dc6b1a066..20160a89e 100644 --- a/doc/source/datanet/kubernetes/removing-a-data-network-using-the-cli.rst +++ b/doc/source/datanet/kubernetes/removing-a-data-network-using-the-cli.rst @@ -11,7 +11,7 @@ associations. .. rubric:: |context| -Complete the following steps to delete a data interface. +Complete the following steps to delete a data network. .. rubric:: |prereq| @@ -21,7 +21,7 @@ The following procedure requires that the host be locked. #. Remove the data network from the interface. - #. Identify the interface to be removed. + #. Identify the interface to be removed from the data network. For example: @@ -36,7 +36,7 @@ The following procedure requires that the host be locked. | controller-1 | c4ac3c62-283e-491f-a08b-2e4a5ece205c | pthru0 | group0-data0 | +--------------+--------------------------------------+--------+------------------+ - #. Remove the network. + #. Remove the interface from the network. For example: diff --git a/doc/source/datanet/kubernetes/vxlan-data-networks.rst b/doc/source/datanet/kubernetes/vxlan-data-networks.rst index 57eeb5a58..aa7e56601 100644 --- a/doc/source/datanet/kubernetes/vxlan-data-networks.rst +++ b/doc/source/datanet/kubernetes/vxlan-data-networks.rst @@ -41,6 +41,11 @@ are included in the outer IP header. Before you can create project networks on a |VXLAN| provider network, you must define at least one network segment range. +.. note:: + + Static VXLAN is limited to one data network, and if configured, it must + be enabled on all openstack-compute labeled nodes. + - :ref:`Dynamic VXLAN ` - :ref:`Static VXLAN ` diff --git a/doc/source/system_configuration/kubernetes/applying-a-custom-branding-tarball-to-newly-installed-systems.rst b/doc/source/system_configuration/kubernetes/applying-a-custom-branding-tarball-to-newly-installed-systems.rst index 29f053b86..ec2586453 100644 --- a/doc/source/system_configuration/kubernetes/applying-a-custom-branding-tarball-to-newly-installed-systems.rst +++ b/doc/source/system_configuration/kubernetes/applying-a-custom-branding-tarball-to-newly-installed-systems.rst @@ -2,14 +2,14 @@ .. hur1582149306886 .. _applying-a-custom-branding-tarball-to-newly-installed-systems: -========================================================== -Apply a Custom Branding Tarball to Newly Installed Systems -========================================================== +================================================================== +Apply a Custom Horizon Branding Tarball to Newly Installed Systems +================================================================== -You can apply a custom branding tarball to newly installed systems +You can apply a custom Horizon branding tarball to newly installed systems prior to running the bootstrap playbook. -Complete the following steps to apply the custom branding tarball: +Complete the following steps to apply the custom Horizon branding tarball: .. rubric:: |proc| diff --git a/doc/source/system_configuration/kubernetes/applying-a-custom-branding-tarball-to-running-systems.rst b/doc/source/system_configuration/kubernetes/applying-a-custom-branding-tarball-to-running-systems.rst index 6e953b8ae..35a5259e8 100644 --- a/doc/source/system_configuration/kubernetes/applying-a-custom-branding-tarball-to-running-systems.rst +++ b/doc/source/system_configuration/kubernetes/applying-a-custom-branding-tarball-to-running-systems.rst @@ -2,13 +2,13 @@ .. cmk1582149379500 .. _applying-a-custom-branding-tarball-to-running-systems: -================================================== -Apply a Custom Branding Tarball to Running Systems -================================================== +========================================================== +Apply a Custom Horizon Branding Tarball to Running Systems +========================================================== -You can apply the custom branding tarball to running systems. +You can apply the custom Horizon branding tarball to running systems. -Complete the following steps to apply the custom branding tarball: +Complete the following steps to apply the custom Horizon branding tarball: .. rubric:: |proc| @@ -16,7 +16,7 @@ Complete the following steps to apply the custom branding tarball: #. Delete any previous branding tarball from /opt/branding. -#. Copy the new branding tarball to the /opt/branding directory on the +#. Copy the new Horizon branding tarball to the /opt/branding directory on the active controller. #. Restart the Horizon Web interface. diff --git a/doc/source/system_configuration/kubernetes/changing-the-oam-ip-configuration-using-horizon.rst b/doc/source/system_configuration/kubernetes/changing-the-oam-ip-configuration-using-horizon.rst index 6890bd3c7..f8102cdca 100644 --- a/doc/source/system_configuration/kubernetes/changing-the-oam-ip-configuration-using-horizon.rst +++ b/doc/source/system_configuration/kubernetes/changing-the-oam-ip-configuration-using-horizon.rst @@ -63,7 +63,7 @@ and ensure that any existing system alarms are cleared. If you change the IP address version \(IPv4 or IPv6\), ensure that the same version is used for the DNS servers \(see :ref:`Specify DNS Servers Using Horizon `\) - and NTP servers \(see :ref:`Configure NTP Servers and Services Using Horizon `\). + and NTP servers \(see :ref:`Configure NTP Servers Using Horizon `\). #. Click **Save**. diff --git a/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-horizon.rst b/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-horizon.rst index 8b056fb1d..4e31bee8f 100644 --- a/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-horizon.rst +++ b/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-horizon.rst @@ -3,7 +3,7 @@ .. _configuring-ntp-servers-and-services-using-horizon: ================================================ -Configure NTP Servers and Services Using Horizon +Configure NTP Servers Using Horizon ================================================ You can add or update a list of external NTP servers for |prod| to use for diff --git a/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-the-cli.rst b/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-the-cli.rst index ea60b3fdf..d97ca4049 100644 --- a/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-the-cli.rst +++ b/doc/source/system_configuration/kubernetes/configuring-ntp-servers-and-services-using-the-cli.rst @@ -2,16 +2,16 @@ .. ktx1552673128591 .. _configuring-ntp-servers-and-services-using-the-cli: -================================================ -Configure NTP Servers and Services Using the CLI -================================================ +=================================== +Configure NTP Servers Using the CLI +=================================== You can use the CLI to add or update a list of |NTP| servers and services. **NTP Servers** You can specify up to three |NTP| servers using the CLI or the Horizon Web -interface. For more information, see :ref:`Configure NTP Servers and Services Using Horizon `. +interface. For more information, see :ref:`Configure NTP Servers Using Horizon `. To view the existing |NTP| server configuration, use the following command. diff --git a/doc/source/system_configuration/kubernetes/creating-a-custom-branding-tarball.rst b/doc/source/system_configuration/kubernetes/creating-a-custom-branding-tarball.rst index b5d9a9805..03fe06caf 100644 --- a/doc/source/system_configuration/kubernetes/creating-a-custom-branding-tarball.rst +++ b/doc/source/system_configuration/kubernetes/creating-a-custom-branding-tarball.rst @@ -2,9 +2,9 @@ .. ngt1557520137257 .. _creating-a-custom-branding-tarball: -================================ -Create a Custom Branding Tarball -================================ +======================================== +Create a Custom Horizon Branding Tarball +======================================== This section contains instructions and examples for creating and applying a tarball containing a custom Horizon Web interface theme, and associated @@ -122,9 +122,9 @@ installation. For more information on applying the tarball to newly installed systems prior to running the bootstrap playbook, -see :ref:`Apply a Custom Branding Tarball to Newly Installed Systems +see :ref:`Apply a Custom Horizon Branding Tarball to Newly Installed Systems `. For more information on applying the tarball to running systems, -see :ref:`Apply a Custom Branding Tarball to Running Systems +see :ref:`Apply a Custom Horizon Branding Tarball to Running Systems `. \ No newline at end of file