Removed "Add Taints to OpenStack Node in Hybrid Cluster" topic

Updated Patchset 2 comments
Removed kubectl taint nodes $NODE openstack-compute-node:NoSchedule from Stx 5.0 Release
Added: kubectl taint nodes $NODE openstack-compute-node:NoSchedule

Signed-off-by: Juanita-Balaraj <juanita.balaraj@windriver.com>
Change-Id: I3a9f57d8b92c7bcb144d203674b78855edb7edfd

doc/source/_includes/hybrid-cluster.rest

@@ -0,0 +1,3 @@
+
+.. begin-prepare-cloud-platform
+.. end-prepare-cloud-platform

doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_extend.rst

@@ -102,6 +102,7 @@ Configure worker nodes
 
          for NODE in worker-0 worker-1; do
             system host-label-assign $NODE  openstack-compute-node=enabled
+            kubectl taint nodes $NODE openstack-compute-node:NoSchedule
             system host-label-assign $NODE  |vswitch-label|
             system host-label-assign $NODE  sriov=enabled
          done

doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_install_kubernetes.rst

@@ -632,6 +632,7 @@ Configure worker nodes
 
          for NODE in worker-0 worker-1; do
            system host-label-assign $NODE  openstack-compute-node=enabled
+           kubectl taint nodes $NODE openstack-compute-node:NoSchedule
            system host-label-assign $NODE  |vswitch-label|
          done
 

doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_install_kubernetes.rst

@@ -283,6 +283,7 @@ Configure worker nodes
 
          for NODE in worker-0 worker-1; do
            system host-label-assign $NODE  openstack-compute-node=enabled
+           kubectl taint nodes $NODE openstack-compute-node:NoSchedule
            system host-label-assign $NODE  |vswitch-label|
            system host-label-assign $NODE  sriov=enabled
          done

doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_install_kubernetes.rst

@@ -595,6 +595,7 @@ OpenStack-specific host configuration
 
          for NODE in worker-0 worker-1; do
              system host-label-assign $NODE  openstack-compute-node=enabled
+             kubectl taint nodes $NODE openstack-compute-node:NoSchedule
              system host-label-assign $NODE  |vswitch-label|
              system host-label-assign $NODE  sriov=enabled
          done

doc/source/deploy_install_guides/r6_release/openstack/add-taints-to-openstack-node-in-hybrid-cluster-e8b37e8d1b48.rst

@@ -1,36 +0,0 @@
-.. _add-taints-to-openstack-node-in-hybrid-cluster-e8b37e8d1b48-r6:
-
-==============================================
-Add Taints to OpenStack Node in Hybrid Cluster
-==============================================
-
-.. rubric:: |context|
-
-In a hybrid (Kubernetes and OpenStack) cluster scenario, to prevent end-users'
-hosted containerized workloads/pods from being scheduled on
-``openstack-compute-nodes`` a taint that only openstack and platform pods are
-able to tolerate must be added. Thus, any pod that is not platform or
-OpenStack specific can be repelled. To achieve this control, the
-``openstack-compute-node`` taint must be added to all
-``openstack-compute-nodes``  (i.e. worker nodes or |AIO|-Controller nodes with
-the ``openstack-compute-node`` label).
-
-By applying taints, it is possible to separate end users' containerized
-workloads/pods from OpenStack in a hybrid (Kubernetes and OpenStack) cluster
-scenario.
-
-.. rubric:: |proc|
-
-#.  Apply taints.
-
-    This step is needed to prevent end-users' hosted containerized
-    workloads/pods from being scheduled on openstack computes  (i.e. worker
-    nodes or |AIO|-Controller nodes with the ``openstack-compute-node`` label).
-
-    Apply this taint on every ``openstack-compute-node`` (i.e. worker nodes
-    or |AIO|-Controller nodes with the ``openstack-compute-node`` label):
-
-    .. code-block:: none
-
-        kubectl taint nodes <kubernetes-node-name> openstack-compute-node:NoSchedule
-

doc/source/deploy_install_guides/r6_release/openstack/convert-worker-nodes-0007b1532308.rst

@@ -19,9 +19,11 @@ worker nodes to/from ``openstack-compute-nodes``.
 
             system host-lock <host>
 
-    #.  Add the ``openstack-compute-node`` taint, see :ref:`Add Taints to
+    #.  Add the ``openstack-compute-node`` taint.
-        OpenStack Node in Hybrid Cluster
+
-        <add-taints-to-openstack-node-in-hybrid-cluster-e8b37e8d1b48-r6>`.
+        .. code-block:: none
+
+            kubectl taint nodes <kubernetes-node-name> openstack-compute-node:NoSchedule
 
     #.  Assign OpenStack labels:
 

doc/source/deploy_install_guides/r6_release/openstack/hybrid-cluster-c7a3134b6f2a.rst

@@ -13,6 +13,12 @@ The host labels are used to define each worker function on the Hybrid Cluster
 setup. For example, a standard configuration (2 controllers and 2 computes) can
 be split into (2 controllers, 1 openstack-compute and 1 kubernetes-worker).
 
+.. only:: partner
+
+   .. include:: /_includes/hybrid-cluster.rest
+       :start-after: begin-prepare-cloud-platform
+       :end-before: end-prepare-cloud-platform
+
 -----------
 Limitations
 -----------
@@ -37,9 +43,7 @@ Limitations
 
 -   Taints must be added to OpenStack compute hosts (i.e. worker nodes or
     |AIO|-Controller nodes with the ``openstack-compute-node`` label) to
-    prevent
+    prevent end users' hosted containerized workloads/pods from being scheduled on
-    end users' hosted containerized workloads/pods from being scheduled on
+    OpenStack compute hosts.
-    OpenStack compute hosts. See :ref:`Add Taints to OpenStack Node in
+
-    Hybrid Cluster
-    <add-taints-to-openstack-node-in-hybrid-cluster-e8b37e8d1b48-r6>`.
 

doc/source/deploy_install_guides/r6_release/openstack/index-install-r6-os-adc44604968c.rst

@@ -25,5 +25,6 @@ Hybrid Cluster
    :maxdepth: 1
 
    hybrid-cluster-c7a3134b6f2a
-   add-taints-to-openstack-node-in-hybrid-cluster-e8b37e8d1b48
    convert-worker-nodes-0007b1532308
+
+

doc/source/deploy_install_guides/r6_release/virtual/controller_storage_install_kubernetes.rst

@@ -510,6 +510,7 @@ OpenStack-specific host configuration
 
       for NODE in worker-0 worker-1; do
         system host-label-assign $NODE  openstack-compute-node=enabled
+        kubectl taint nodes $NODE openstack-compute-node:NoSchedule
         system host-label-assign $NODE  openvswitch=enabled
       done
 

doc/source/deploy_install_guides/r6_release/virtual/dedicated_storage_install_kubernetes.rst

@@ -367,6 +367,7 @@ OpenStack-specific host configuration
 
       for NODE in worker-0 worker-1; do
         system host-label-assign $NODE  openstack-compute-node=enabled
+        kubectl taint nodes $NODE openstack-compute-node:NoSchedule
         system host-label-assign $NODE  |vswitch-label|
         system host-label-assign $NODE  sriov=enabled
       done

doc/source/deploy_install_guides/r6_release/virtual/rook_storage_install_kubernetes.rst

@@ -435,6 +435,7 @@ OpenStack-specific host configuration
 
       for NODE in worker-0 worker-1; do
         system host-label-assign $NODE  openstack-compute-node=enabled
+        kubectl taint nodes $NODE openstack-compute-node:NoSchedule
         system host-label-assign $NODE  openvswitch=enabled
         system host-label-assign $NODE  sriov=enabled
       done