DS openstack updates

Changes required to support downstream openstack reuse.
Resolved merge conflict.
security/openstack/index adjustment.
Patchset 3 updates.

Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: I981379d1dedcc2649a6035a0302ef8a838c35433
Signed-off-by: Ron Stone <ronald.stone@windriver.com>

doc/source/datanet/openstack/data-networks-overview.rst

@@ -12,7 +12,7 @@ and pci-passthrough interfaces attach to.
 .. note::
 
     Data networks are required if you plan to deploy the openstack application
-    or provide SR-IOV network interface access to container workloads.
+    or provide |SRIOV| network interface access to container workloads.
 
 A Layer 2 physical or virtual network or set of virtual networks is used to
 provide the underlying network connectivity needed to support the application
@@ -22,10 +22,10 @@ networks is typically granted to the **openstack-compute** labeled worker nodes
 using the data network. The extent of this connectivity, including access to
 the open internet, is application dependent.
 
-Data networks are created at the |prod| level. Flat, VLAN and VXLAN type
+Data networks are created at the |prod| level. Flat, |VLAN| and |VXLAN| type
 data networks are supported by the |prod-os| virtual switch. For details on
-creating data networks and assigning them to node interfaces, see the
+creating data networks, assigning them to node interfaces, and displaying
-following documentation:
+data networks, see the following |prod| documentation:
 
 .. _data-networks-overview-ul-yj1-dtq-3nb:
 
@@ -38,7 +38,18 @@ following documentation:
 -   :ref:`Removing a Data Network Using the CLI
     <removing-a-data-network-using-the-cli>`
 
-VXLAN Data Networks are specific to |prod-os| application.
+-  :ref:`Display Data Network information using Horizon
+   <displaying-data-network-information-using-horizon>`
+
+-  :ref:`Display Data Network information using the CLI
+   <displaying-data-network-information-using-the-cli>`
+
+-  :ref:`The Data Network topology view
+   <the-data-network-topology-view>`
+
+
+
+|VXLAN| Data Networks are specific to |prod-os| application.
 
 .. xreflink and are described in detail in :ref:`VXLAN Data Networks
    <vxlan-data-networks>`.

doc/source/security/openstack/index.rst

@@ -1,10 +1,20 @@
----------
+========
-OpenStack
+Contents
----------
+========
 
-=================
+-----------------
-Access the System
+Keystone Accounts
-=================
+-----------------
+
+.. toctree::
+   :maxdepth: 1
+
+   openstack-keystone-accounts
+   security-system-account-password-rules
+
+-----------------
+Access the system
+-----------------
 
 .. toctree::
    :maxdepth: 1
@@ -15,8 +25,15 @@ Access the System
    update-the-domain-name
    configure-remote-clis-and-clients
    config-and-management-using-container-backed-remote-clis-and-clients
-   install-a-trusted-ca-certificate
-   install-rest-api-and-horizon-certificate
-   openstack-keystone-accounts
-   security-system-account-password-rules
    openstack-login-protection
+
+----------------------------------------
+Install REST API and Horizon certificate
+----------------------------------------
+
+.. toctree::
+   :maxdepth: 1
+
+   install-rest-api-and-horizon-certificate
+   install-a-trusted-ca-certificate
+

doc/source/security/openstack/install-a-trusted-ca-certificate.rst

@@ -8,9 +8,9 @@ Install a Trusted CA Certificate
 
 A trusted |CA| certificate can be added to the |prod-os| service containers
 such that the containerized OpenStack services can validate certificates of
-far-end systems connecting or being connected to over HTTPS. The most common
+far-end systems connecting or being connected to over HTTPS. This is commonly
-use case here would be to enable certificate validation of clients connecting
+done to enable certificate validation of clients connecting to OpenStack
-to OpenStack service REST API endpoints.
+service REST API endpoints.
 
 .. rubric:: |proc|
 
@@ -23,15 +23,13 @@ to OpenStack service REST API endpoints.
 
         ~(keystone_admin)$ system certificate-install -m openstack_ca <certificate_file>
 
-    where <certificate\_file> contains a single |CA| certificate to be trusted.
+    where ``<certificate_file>`` contains a single |CA| certificate to be trusted.
 
-    Running the command again with a different |CA| certificate in the file will
+    Running the command again with a different |CA| certificate in the file
-    *replace* this openstack trusted |CA| certificate.
+    will *replace* this openstack trusted |CA| certificate.
 
 #.  Apply the updated Helm chart overrides containing the certificate changes:
 
     .. code-block:: none
 
         ~(keystone_admin)$ system application-apply wr-openstack
-
-

doc/source/security/openstack/security-system-account-password-rules.rst

@@ -2,9 +2,9 @@
 .. tfb1485354135500
 .. _security-system-account-password-rules:
 
-=============================
+===============================
-System Account Password Rules
+Keystone Account Password Rules
-=============================
+===============================
 
 |prod-os| enforces a set of strength requirements for new or changed passwords.
 

doc/source/storage/openstack/index.rst

@@ -21,3 +21,5 @@ Contents
    specifying-the-storage-type-for-vm-ephemeral-disks
    storage-configuring-and-management-storage-related-cli-commands
    storage-configuration-and-management-storage-utilization-display
+
+