Openstack .. include changes

Made paths to include files relative to doc source. This is needed for downstream builds
and is good practice for reusability.
Fixed some include statements with broken syntax.
Added missing section labels to include file.

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

doc/source/_includes/resource-planning.rest

@@ -0,0 +1,10 @@
+.. avs-text-1-begin
+
+.. avs-text-2-end
+
+
+.. avs-text-2-begin
+
+.. avs-text-2-end
+
+.. avs-text-1-end

doc/source/backup/openstack/restore-openstack-from-a-backup.rst

@@ -117,4 +117,4 @@ You can restore |prod-os| from a backup with or without Ceph.
         |                                                                                                                                                                                          |         backup_filename=wr-openstack_backup.tgz'                                                                                                                                         |
         +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
-.. include:: ../../_includes/restore-openstack-from-a-backup.rest
+.. include:: /_includes/restore-openstack-from-a-backup.rest

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

@@ -49,4 +49,4 @@ OpenStack Neutron commands, see :ref:`Adding Segmentation Ranges Using the CLI
 
 .. only:: partner
 
-   .. include:: ../../_includes/data-networks-overview.rest
+   .. include:: /_includes/data-networks-overview.rest

doc/source/datanet/openstack/dynamic-vxlan.rst

@@ -33,10 +33,9 @@ for more complex routing requirements but requires IP multicast enabled routers.
 
 .. only:: partner
 
-    .. include:: ../../_includes/dynamic-vxlan.rest
+    .. include:: /_includes/dynamic-vxlan.rest
-
+       :start-after: vswitch-text-1-begin
-    :start-after: vswitch-text-1-begin
+       :end-before:  vswitch-text-1-end
-    :end-before:  vswitch-text-1-end
 
 .. figure:: ../figures/eol1510005391750.png
 
@@ -52,10 +51,9 @@ Multicast Endpoint Distribution
 
 .. only:: partner
 
-    .. include:: ../../_includes/dynamic-vxlan.rest
+    .. include:: /_includes/dynamic-vxlan.rest
-
+       :start-after: vswitch-text-1-begin
-    :start-after: vswitch-text-1-begin
+       :end-before: vswitch-text-1-end
-    :end-before: vswitch-text-1-end
 
 
 .. _dynamic-vxlan-section-N10054-N1001F-N10001:
@@ -94,4 +92,4 @@ segmentation ranges using the |CLI|.
 
 For more information on the differences between the dynamic and static |VXLAN|
 modes, see :ref:`Differences Between Dynamic and Static VXLAN Modes
-<differences-between-dynamic-and-static-vxlan-modes>`.
+<differences-between-dynamic-and-static-vxlan-modes>`.

doc/source/datanet/openstack/static-vxlan.rst

@@ -20,7 +20,7 @@ to receive the packet in order to reach the |VM|.
 
 .. only:: partner
 
-    .. include:: ../../_includes/static-vxlan.rest
+    .. include:: /_includes/static-vxlan.rest
 
     :start-after: vswitch-text-1-begin
     :end-before:  vswitch-text-1-end
@@ -60,4 +60,4 @@ segmentation ranges using the |CLI|.
 
 For more information on the differences between the dynamic and static |VXLAN|
 modes, see :ref:`Differences Between Dynamic and Static VXLAN Modes
-<differences-between-dynamic-and-static-vxlan-modes>`.
+<differences-between-dynamic-and-static-vxlan-modes>`.

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

@@ -25,7 +25,7 @@ are included in the outer IP header.
 
 .. only:: partner
 
-    .. include:: ../../_includes/vxlan-data-networks.rest
+    .. include:: /_includes/vxlan-data-networks.rest
 
 .. _vxlan-data-networks-ul-rzs-kqf-zbb:
 

doc/source/fault-mgmt/openstack/openstack-alarm-messages-400s.rst

@@ -6,7 +6,7 @@
 Alarm Messages - 400s
 =====================
 
-.. include:: ../../_includes/openstack-alarm-messages-xxxs.rest
+.. include:: /_includes/openstack-alarm-messages-xxxs.rest
 
 .. list-table::
    :widths: 6 15
@@ -52,4 +52,4 @@ Alarm Messages - 400s
    * - Severity:
      - M\*
    * - Proposed Repair Action
-     - Bring a controller node back in to service, otherwise contact next level of support.
+     - Bring a controller node back in to service, otherwise contact next level of support.

doc/source/fault-mgmt/openstack/openstack-alarm-messages-700s.rst

@@ -6,7 +6,7 @@
 Alarm Messages - 700s
 =====================
 
-.. include:: ../../_includes/openstack-alarm-messages-xxxs.rest
+.. include:: /_includes/openstack-alarm-messages-xxxs.rest
 
 .. _alarm-messages-700s-table-zrd-tg5-v5:
 
@@ -272,4 +272,4 @@ Alarm Messages - 700s
      - M
    * - Proposed Repair Action
      - Migrate instances in an attempt to satisfy the policy; if problem
-       persists contact next level of support.
+       persists contact next level of support.

doc/source/fault-mgmt/openstack/openstack-alarm-messages-800s.rst

@@ -6,7 +6,7 @@
 Alarm Messages - 800s
 =====================
 
-.. include:: ../../_includes/openstack-alarm-messages-xxxs.rest
+.. include:: /_includes/openstack-alarm-messages-xxxs.rest
 
 .. _alarm-messages-800s-table-zrd-tg5-v5:
 

doc/source/fault-mgmt/openstack/openstack-customer-log-messages-270s-virtual-machines.rst

@@ -6,7 +6,7 @@
 Customer Log Messages 270s - Virtual Machines
 =============================================
 
-.. include:: ../../_includes/openstack-customer-log-messages-xxxs.rest
+.. include:: /_includes/openstack-customer-log-messages-xxxs.rest
 
 .. _customer-log-messages-270s-virtual-machines-table-zgf-jvw-v5:
 
@@ -35,4 +35,4 @@ Customer Log Messages 270s - Virtual Machines
     |           | tenant=<tenant-uuid>.instance=<instance-uuid>                                    |          |
     +-----------+----------------------------------------------------------------------------------+----------+
 
-See also :ref:`Customer Log Messages 700s - Virtual Machines <customer-log-messages-700s-virtual-machines>`
+See also :ref:`Customer Log Messages 700s - Virtual Machines <customer-log-messages-700s-virtual-machines>`

doc/source/fault-mgmt/openstack/openstack-customer-log-messages-401s-services.rst

@@ -6,7 +6,7 @@
 Customer Log Messages 401s - Services
 =====================================
 
-.. include:: ../../_includes/openstack-customer-log-messages-xxxs.rest
+.. include:: /_includes/openstack-customer-log-messages-xxxs.rest
 
 .. _customer-log-messages-401s-services-table-zgf-jvw-v5:
 

doc/source/fault-mgmt/openstack/openstack-customer-log-messages-700s-virtual-machines.rst

@@ -6,7 +6,7 @@
 Customer Log Messages 700s - Virtual Machines
 =============================================
 
-.. include:: ../../_includes/openstack-customer-log-messages-xxxs.rest
+.. include:: /_includes/openstack-customer-log-messages-xxxs.rest
 
 .. _customer-log-messages-700s-virtual-machines-table-zgf-jvw-v5:
 
@@ -477,4 +477,4 @@ Customer Log Messages 700s - Virtual Machines
     |          | subsystem-vim                                                                                                                                                                      |          |
     +----------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------+
 
-See also :ref:`Customer Log Messages 270s - Virtual Machines <customer-log-messages-270s-virtual-machines>`
+See also :ref:`Customer Log Messages 270s - Virtual Machines <customer-log-messages-270s-virtual-machines>`

doc/source/fault-mgmt/openstack/openstack-fault-management-overview.rst

@@ -21,4 +21,4 @@ Management Protocol)` are available on the |prod| REST APIs, :abbr:`CLIs
 
 .. only:: partner
 
-    .. include:: ../../_includes/openstack-fault-management-overview.rest
+    .. include:: /_includes/openstack-fault-management-overview.rest

doc/source/planning/openstack/resource-planning.rst

@@ -28,26 +28,23 @@ Resource Placement
 
 .. only:: partner
 
-    .. include:: ../../_includes/resource-planning.rest
+    .. include:: /_includes/resource-planning.rest
-
+        :start-after: avs-text-1-begin
-    :start-after: avs-text-1-begin
+        :end-before:  avs-text-2-end
-    :end-before:  avs-text-2-end
 
 .. only:: partner
 
-    .. include:: ../../_includes/resource-planning.rest
+    .. include:: /_includes/resource-planning.rest
-
+        :start-after: avs-text-2-begin
-    :start-after: avs-text-2-begin
+        :end-before:  avs-text-2-end
-    :end-before:  avs-text-2-end
 
 
 .. _resource-planning-ul-tcb-ssz-55:
 
 .. only:: partner
 
-    .. include:: ../../_includes/resource-planning.rest
+    .. include:: /_includes/resource-planning.rest
-
+        :start-after: avs-text-1-end
-    :start-after: avs-text-1-end
 
 
 If accessing |PCIe| devices directly from a |VM| using |PCI|-Passthrough or