diff --git a/doc/source/_includes/hybrid-cluster.rest b/doc/source/_includes/hybrid-cluster.rest new file mode 100644 index 000000000..7ed9af096 --- /dev/null +++ b/doc/source/_includes/hybrid-cluster.rest @@ -0,0 +1,3 @@ + +.. begin-prepare-cloud-platform +.. end-prepare-cloud-platform \ No newline at end of file diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_extend.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_extend.rst index 939119b30..be48818d2 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/aio_duplex_extend.rst +++ b/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 diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_install_kubernetes.rst index 1c9422dc3..4a8506088 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/controller_storage_install_kubernetes.rst +++ b/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 diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_install_kubernetes.rst index 495146bfc..54876557e 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/dedicated_storage_install_kubernetes.rst +++ b/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 diff --git a/doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_install_kubernetes.rst index a243d38a2..6ccc0d0f4 100644 --- a/doc/source/deploy_install_guides/r6_release/bare_metal/rook_storage_install_kubernetes.rst +++ b/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 diff --git a/doc/source/deploy_install_guides/r6_release/openstack/add-taints-to-openstack-node-in-hybrid-cluster-e8b37e8d1b48.rst b/doc/source/deploy_install_guides/r6_release/openstack/add-taints-to-openstack-node-in-hybrid-cluster-e8b37e8d1b48.rst deleted file mode 100644 index 5c794f6a7..000000000 --- a/doc/source/deploy_install_guides/r6_release/openstack/add-taints-to-openstack-node-in-hybrid-cluster-e8b37e8d1b48.rst +++ /dev/null @@ -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 openstack-compute-node:NoSchedule - diff --git a/doc/source/deploy_install_guides/r6_release/openstack/convert-worker-nodes-0007b1532308.rst b/doc/source/deploy_install_guides/r6_release/openstack/convert-worker-nodes-0007b1532308.rst index ced6d1488..4c41b1676 100644 --- a/doc/source/deploy_install_guides/r6_release/openstack/convert-worker-nodes-0007b1532308.rst +++ b/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 - #. Add the ``openstack-compute-node`` taint, see :ref:`Add Taints to - OpenStack Node in Hybrid Cluster - `. + #. Add the ``openstack-compute-node`` taint. + + .. code-block:: none + + kubectl taint nodes openstack-compute-node:NoSchedule #. Assign OpenStack labels: diff --git a/doc/source/deploy_install_guides/r6_release/openstack/hybrid-cluster-c7a3134b6f2a.rst b/doc/source/deploy_install_guides/r6_release/openstack/hybrid-cluster-c7a3134b6f2a.rst index da5a9b699..a990d46e9 100644 --- a/doc/source/deploy_install_guides/r6_release/openstack/hybrid-cluster-c7a3134b6f2a.rst +++ b/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 - end users' hosted containerized workloads/pods from being scheduled on - OpenStack compute hosts. See :ref:`Add Taints to OpenStack Node in - Hybrid Cluster - `. + prevent end users' hosted containerized workloads/pods from being scheduled on + OpenStack compute hosts. + diff --git a/doc/source/deploy_install_guides/r6_release/openstack/index-install-r6-os-adc44604968c.rst b/doc/source/deploy_install_guides/r6_release/openstack/index-install-r6-os-adc44604968c.rst index cf0ecaeef..1f7c5f501 100644 --- a/doc/source/deploy_install_guides/r6_release/openstack/index-install-r6-os-adc44604968c.rst +++ b/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 + + diff --git a/doc/source/deploy_install_guides/r6_release/virtual/controller_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/virtual/controller_storage_install_kubernetes.rst index 2d35f8626..e9394ba87 100644 --- a/doc/source/deploy_install_guides/r6_release/virtual/controller_storage_install_kubernetes.rst +++ b/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 diff --git a/doc/source/deploy_install_guides/r6_release/virtual/dedicated_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/virtual/dedicated_storage_install_kubernetes.rst index 638a9d105..fe0c2761a 100644 --- a/doc/source/deploy_install_guides/r6_release/virtual/dedicated_storage_install_kubernetes.rst +++ b/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 diff --git a/doc/source/deploy_install_guides/r6_release/virtual/rook_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r6_release/virtual/rook_storage_install_kubernetes.rst index a278289aa..6cad13010 100644 --- a/doc/source/deploy_install_guides/r6_release/virtual/rook_storage_install_kubernetes.rst +++ b/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