From 9a9fee43b52cc5aac63ae681c6dd6d26a489213e Mon Sep 17 00:00:00 2001 From: Juanita-Balaraj Date: Mon, 14 Feb 2022 15:27:33 -0500 Subject: [PATCH] Removed instances of partner occurences (pick stx 5.0, stx 6.0) Signed-off-by: Juanita-Balaraj Change-Id: I3e505b7bbd31f80350424c0841eb47183ff7cf3c --- doc/source/_includes/rehoming-a-subcloud.rest | 5 ++++- .../upgrading-the-systemcontroller-using-the-cli.rest | 5 ++++- ...bcloud-without-redfish-platform-management-service.rst | 2 +- doc/source/dist_cloud/kubernetes/rehoming-a-subcloud.rst | 8 +++++--- .../upgrading-the-systemcontroller-using-the-cli.rst | 7 +++++-- ...ment-group-number-dimensioning-for-storage-cluster.rst | 2 +- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/doc/source/_includes/rehoming-a-subcloud.rest b/doc/source/_includes/rehoming-a-subcloud.rest index fde54f527..959e552fa 100644 --- a/doc/source/_includes/rehoming-a-subcloud.rest +++ b/doc/source/_includes/rehoming-a-subcloud.rest @@ -1,3 +1,6 @@ .. rehoming-begin -.. rehoming-end \ No newline at end of file +.. rehoming-end + +.. rehoming-supportbegin +.. rehoming-supportend \ No newline at end of file diff --git a/doc/source/_includes/upgrading-the-systemcontroller-using-the-cli.rest b/doc/source/_includes/upgrading-the-systemcontroller-using-the-cli.rest index 8b506eb7b..25d0d91cc 100644 --- a/doc/source/_includes/upgrading-the-systemcontroller-using-the-cli.rest +++ b/doc/source/_includes/upgrading-the-systemcontroller-using-the-cli.rest @@ -3,4 +3,7 @@ .. license-end .. upgradeDM-begin -.. upgradeDM-end \ No newline at end of file +.. upgradeDM-end + +.. wrsbegin +.. wrsend \ No newline at end of file diff --git a/doc/source/dist_cloud/kubernetes/installing-a-subcloud-without-redfish-platform-management-service.rst b/doc/source/dist_cloud/kubernetes/installing-a-subcloud-without-redfish-platform-management-service.rst index 51f8059b3..d6a4ad222 100644 --- a/doc/source/dist_cloud/kubernetes/installing-a-subcloud-without-redfish-platform-management-service.rst +++ b/doc/source/dist_cloud/kubernetes/installing-a-subcloud-without-redfish-platform-management-service.rst @@ -258,7 +258,7 @@ subcloud, the subcloud installation process has two phases: The deploy status field has the following values: **Bootstrapping** - This status indicates that the Ansible bootstrap of Wind River Cloud + This status indicates that the Ansible bootstrap of |prod-long| Platform software on the subcloud's controller-0 is in progress. **Complete** diff --git a/doc/source/dist_cloud/kubernetes/rehoming-a-subcloud.rst b/doc/source/dist_cloud/kubernetes/rehoming-a-subcloud.rst index dd97e073d..258161e2f 100644 --- a/doc/source/dist_cloud/kubernetes/rehoming-a-subcloud.rst +++ b/doc/source/dist_cloud/kubernetes/rehoming-a-subcloud.rst @@ -245,13 +245,15 @@ the new System Controller and re-attempt rehoming using the following commands: ~(keystone_admin)]$ dcmanager subcloud delete ~(keystone_admin)]$ dcmanager subcloud add --migrate --bootstrap-address --bootstrap-values [--install-values ] -If the second attempt fails, it is recommended to contact Wind River Customer -Support at https://www.windriver.com/support. +.. only:: partner + + .. include:: /_includes/rehoming-a-subcloud.rest + :start-after: rehoming-supportbegin + :end-before: rehoming-supportend If all attempts fail, restore the subcloud from backups, that will revert the subcloud to the original state prior to rehoming. - .. only:: partner .. include:: /_includes/dm-credentials-on-keystone-pwds.rest \ No newline at end of file diff --git a/doc/source/dist_cloud/kubernetes/upgrading-the-systemcontroller-using-the-cli.rst b/doc/source/dist_cloud/kubernetes/upgrading-the-systemcontroller-using-the-cli.rst index 2f323c9e0..8863141e6 100644 --- a/doc/source/dist_cloud/kubernetes/upgrading-the-systemcontroller-using-the-cli.rst +++ b/doc/source/dist_cloud/kubernetes/upgrading-the-systemcontroller-using-the-cli.rst @@ -58,8 +58,11 @@ Follow the steps below to manually upgrade the System Controller: during the software upgrade procedure as the hosts are reset to load the new release of software. - To find and download applicable updates, visit the `Wind River Support - Network `__. + .. only:: partner + + .. include:: /_includes/upgrading-the-systemcontroller-using-the-cli.rest + :start-after: wrsbegin + :end-before: wrsend For more information, see |updates-doc|: :ref:`Managing Software Updates `. diff --git a/doc/source/storage/openstack/config-and-management-ceph-placement-group-number-dimensioning-for-storage-cluster.rst b/doc/source/storage/openstack/config-and-management-ceph-placement-group-number-dimensioning-for-storage-cluster.rst index 71a781f6c..fc56bf343 100644 --- a/doc/source/storage/openstack/config-and-management-ceph-placement-group-number-dimensioning-for-storage-cluster.rst +++ b/doc/source/storage/openstack/config-and-management-ceph-placement-group-number-dimensioning-for-storage-cluster.rst @@ -26,7 +26,7 @@ The following is a list of pools created by |prod-os|, and Rados Gateway applica +==================================+=====================+===============================================================+==========+========================================================================================+ | Platform Integration Application | kube-rbd | Kubernetes RBD provisioned PVCs | 64 | When the platform automatically upload/applies after the Ceph cluster is provisioned | +----------------------------------+---------------------+---------------------------------------------------------------+----------+----------------------------------------------------------------------------------------+ - | Wind River OpenStack | images | - glance image file storage | 256 | When the user applies the application for the first time | + | OpenStack | images | - glance image file storage | 256 | When the user applies the application for the first time | | | | | | | | | | - used for VM boot disk images | | | +----------------------------------+---------------------+---------------------------------------------------------------+----------+----------------------------------------------------------------------------------------+