From fa17000dd2051bbd12553e7eaab35689f0bae0e2 Mon Sep 17 00:00:00 2001 From: Erin Donnelly Date: Wed, 30 Mar 2022 15:51:14 -0400 Subject: [PATCH] Rebase Fix missed instances of OCS and replaced with ODF Minor fixes fix build error Add IBM Power and Z Fix build error Fix errors attempt at build fix --- _attributes/common-attributes.adoc | 4 +- _topic_maps/_topic_map.yml | 2 +- .../backing-up-applications.adoc | 2 +- .../installing/about-installing-oadp.adoc | 2 +- .../installing/installing-oadp-mcg.adoc | 1 + .../installing/installing-oadp-ocs.adoc | 6 +- .../installing-restricted-3-4.adoc | 2 +- .../planning-migration-3-4.adoc | 8 +- .../installing-mtc-restricted.adoc | 2 +- ...y-red-hat-openshift-container-storage.adoc | 63 ++++++++----- modules/gathering-data-specific-features.adoc | 6 +- modules/infrastructure-components.adoc | 2 +- modules/migration-configuring-mcg.adoc | 10 +- ...sistent-storage-csi-drivers-supported.adoc | 2 +- ...egistry-configuring-storage-baremetal.adoc | 2 +- .../registry-configuring-storage-vsphere.adoc | 2 +- modules/security-storage-persistent.adoc | 2 +- ...orage-persistent-storage-block-volume.adoc | 2 +- modules/storage-persistent-storage-pv.adoc | 6 +- modules/virt-features-for-storage-matrix.adoc | 4 +- modules/virt-what-you-can-do-with-virt.adoc | 2 +- .../storage-configuration.adoc | 4 +- .../persistent-storage-ocs.adoc | 93 +++++++++---------- .../virt-managing-vm-snapshots.adoc | 2 +- welcome/index.adoc | 7 +- welcome/oke_about.adoc | 6 +- 26 files changed, 129 insertions(+), 115 deletions(-) diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc index a508ed53da..4a25b5d0aa 100644 --- a/_attributes/common-attributes.adoc +++ b/_attributes/common-attributes.adoc @@ -27,8 +27,8 @@ endif::[] :cluster-manager: OpenShift Cluster Manager :cluster-manager-url: link:https://console.redhat.com/openshift[OpenShift Cluster Manager] :cluster-manager-url-pull: link:https://console.redhat.com/openshift/install/pull-secret[pull secret from the Red Hat OpenShift Cluster Manager] -:rh-storage-first: Red Hat OpenShift Container Storage -:rh-storage: OpenShift Container Storage +:rh-storage-first: Red Hat OpenShift Data Foundation +:rh-storage: OpenShift Data Foundation :rh-rhacm-first: Red Hat Advanced Cluster Management (RHACM) :rh-rhacm: RHACM :sandboxed-containers-first: OpenShift sandboxed containers diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 8c6fdd48f6..4feb70a7f3 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -1244,7 +1244,7 @@ Topics: File: persistent-storage-local - Name: Persistent storage using NFS File: persistent-storage-nfs - - Name: Persistent storage using Red Hat OpenShift Container Storage + - Name: Persistent storage using Red Hat OpenShift Data Foundation File: persistent-storage-ocs - Name: Persistent storage using VMware vSphere File: persistent-storage-vsphere diff --git a/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc b/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc index 8a6d10d94e..2398bbe48d 100644 --- a/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc +++ b/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc @@ -9,7 +9,7 @@ toc::[] You back up applications by creating a xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#oadp-creating-backup-cr_backing-up-applications[`Backup`] custom resource (CR). -The `Backup` CR creates backup files for Kubernetes resources and internal images, on S3 object storage, and snapshots for persistent volumes (PVs), if the cloud provider uses a native snapshot API or the xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#oadp-backing-up-pvs-csi_backing-up-applications[Container Storage Interface (CSI)] to create snapshots, such as OpenShift Container Storage 4. For more information, see xref:../../../storage/container_storage_interface/persistent-storage-csi-snapshots.adoc#persistent-storage-csi-snapshots[CSI volume snapshots]. +The `Backup` CR creates backup files for Kubernetes resources and internal images, on S3 object storage, and snapshots for persistent volumes (PVs), if the cloud provider uses a native snapshot API or the xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#oadp-backing-up-pvs-csi_backing-up-applications[Container Storage Interface (CSI)] to create snapshots, such as {rh-storage} 4. For more information, see xref:../../../storage/container_storage_interface/persistent-storage-csi-snapshots.adoc#persistent-storage-csi-snapshots[CSI volume snapshots]. :FeatureName: The `CloudStorage` API for S3 storage include::snippets/technology-preview.adoc[] diff --git a/backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc b/backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc index 44b385761d..7fb14922a6 100644 --- a/backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc +++ b/backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc @@ -27,7 +27,7 @@ To back up PVs with snapshots, you must have a cloud provider that supports eith * xref:../../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-aws.adoc#installing-oadp-aws[Amazon Web Services] * xref:../../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-azure.adoc#installing-oadp-azure[Microsoft Azure] * xref:../../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.adoc#installing-oadp-gcp[Google Cloud Platform] -* CSI snapshot-enabled cloud provider, such as xref:../../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc#installing-oadp-ocs[OpenShift Container Storage] +* CSI snapshot-enabled cloud provider, such as xref:../../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc#installing-oadp-ocs[OpenShift Data Foundation] If your cloud provider does not support snapshots or if your storage is NFS, you can back up applications with xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#oadp-backing-up-applications-restic_backing-up-applications[Restic backups] on object storage. diff --git a/backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc b/backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc index 20222ea0ae..96c79b4a9f 100644 --- a/backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc +++ b/backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc @@ -13,6 +13,7 @@ toc::[] You install the Openshift API for Data Protection (OADP) with Multicloud Object Gateway (MCG) by installing the OADP Operator. The Operator installs link:https://{velero-domain}/docs/v1.7/[Velero 1.7]. You configure xref:../../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc#installing-oadp-mcg[Multicloud Object Gateway] as a backup location. +MCG is a component of {rh-storage}. You configure MCG as a backup location in the `DataProtectionApplication` custom resource (CR). :FeatureName: The `CloudStorage` API for S3 storage include::snippets/technology-preview.adoc[] diff --git a/backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc b/backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc index db91b74b32..41d288f26d 100644 --- a/backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc +++ b/backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc @@ -1,7 +1,7 @@ :_content-type: ASSEMBLY [id="installing-oadp-ocs"] -= Installing and configuring the OpenShift API for Data Protection with OpenShift Container Storage -include::_attributes/common-attributes.adoc[] += Installing and configuring the Openshift API for Data Protection with OpenShift Data Foundation +include::modules/common-attributes.adoc[] :context: installing-oadp-ocs :installing-oadp-ocs: :credentials: cloud-credentials @@ -10,7 +10,7 @@ include::_attributes/common-attributes.adoc[] toc::[] -You install the Openshift API for Data Protection (OADP) with OpenShift Container Storage (OCS) by installing the OADP Operator. The Operator installs link:https://{velero-domain}/docs/v1.7/[Velero 1.7]. +You install the Openshift API for Data Protection (OADP) with {rh-storage} by installing the OADP Operator and configuring a backup location and a snapshot location. Then, you install the Data Protection Application. You can configure xref:../../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc#installing-oadp-mcg[Multicloud Object Gateway] or any S3-compatible object storage as a backup location. diff --git a/migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc b/migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc index 2be747e00b..23dadc401a 100644 --- a/migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc +++ b/migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc @@ -47,7 +47,7 @@ include::modules/migration-configuring-mcg.adoc[leveloffset=+2] [id="{context}_configuring-replication-repository-additional-resources"] === Additional resources -* link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.8/html-single/planning_your_deployment/index#disconnected-environment_rhocs[Disconnected environment] in the Red Hat OpenShift Container Storage documentation. +* link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/planning_your_deployment/disconnected-environment_rhodf[Disconnected environment] in the {rh-storage-first} documentation. * xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#migration-mtc-workflow_about-mtc-3-4[{mtc-short} workflow] * xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#migration-understanding-data-copy-methods_about-mtc-3-4[About data copy methods] * xref:../migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc#migration-adding-replication-repository-to-cam_migrating-applications-3-4[Adding a replication repository to the {mtc-short} web console] diff --git a/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc b/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc index cfd21adc90..8e881b8929 100644 --- a/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc +++ b/migrating_from_ocp_3_to_4/planning-migration-3-4.adoc @@ -101,13 +101,13 @@ Persistent storage using the Container Storage Interface (CSI) was link:https:// For more information, see xref:../storage/container_storage_interface/persistent-storage-csi.adoc#persistent-storage-using-csi[Persistent storage using the Container Storage Interface (CSI)]. [discrete] -==== Red Hat OpenShift Container Storage +==== Red Hat OpenShift Data Foundation -Red Hat OpenShift Container Storage 3, which is available for use with {product-title} 3.11, uses Red Hat Gluster Storage as the backing storage. +OpenShift Container Storage 3, which is available for use with {product-title} 3.11, uses Red Hat Gluster Storage as the backing storage. -Red Hat OpenShift Container Storage 4, which is available for use with {product-title} 4, uses Red Hat Ceph Storage as the backing storage. +{rh-storage-first} 4, which is available for use with {product-title} 4, uses Red Hat Ceph Storage as the backing storage. -For more information, see xref:../storage/persistent_storage/persistent-storage-ocs.adoc#red-hat-openshift-container-storage[Persistent storage using Red Hat OpenShift Container Storage] and the link:https://access.redhat.com/articles/4731161[interoperability matrix] article. +For more information, see xref:../storage/persistent_storage/persistent-storage-ocs.adoc#red-hat-openshift-data-foundation[Persistent storage using Red Hat OpenShift Data Foundation] and the link:https://access.redhat.com/articles/4731161[interoperability matrix] article. [discrete] ==== Unsupported persistent storage options diff --git a/migration_toolkit_for_containers/installing-mtc-restricted.adoc b/migration_toolkit_for_containers/installing-mtc-restricted.adoc index ecb9563c42..4efb3efe72 100644 --- a/migration_toolkit_for_containers/installing-mtc-restricted.adoc +++ b/migration_toolkit_for_containers/installing-mtc-restricted.adoc @@ -55,7 +55,7 @@ include::modules/migration-configuring-mcg.adoc[leveloffset=+2] [id="{context}_configuring-replication-repository-additional-resources"] === Additional resources -* link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.8/html-single/planning_your_deployment/index#disconnected-environment_rhocs[Disconnected environment] in the Red Hat OpenShift Container Storage documentation. +* link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/planning_your_deployment/disconnected-environment_rhodf[Disconnected environment] in the {rh-storage-first} documentation. * xref:../migration_toolkit_for_containers/about-mtc.adoc#migration-mtc-workflow_about-mtc[{mtc-short} workflow] * xref:../migration_toolkit_for_containers/about-mtc.adoc#migration-understanding-data-copy-methods_about-mtc[About data copy methods] * xref:../migration_toolkit_for_containers/migrating-applications-with-mtc.adoc#migration-adding-replication-repository-to-cam_migrating-applications-with-mtc[Adding a replication repository to the {mtc-short} web console] diff --git a/modules/deploy-red-hat-openshift-container-storage.adoc b/modules/deploy-red-hat-openshift-container-storage.adoc index 9b0d6d1efa..9b9410f0bd 100644 --- a/modules/deploy-red-hat-openshift-container-storage.adoc +++ b/modules/deploy-red-hat-openshift-container-storage.adoc @@ -5,46 +5,61 @@ [options="header",cols="1,1"] |=== -|If you are looking for Red Hat OpenShift Container Storage information about... -|See the following Red Hat OpenShift Container Storage documentation: +|If you are looking for {rh-storage-first} information about... +|See the following {rh-storage-first} documentation: |What's new, known issues, notable bug fixes, and Technology Previews -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/4.7_release_notes/index[OpenShift Container Storage 4.7 Release Notes] +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/4.9_release_notes[OpenShift Data Foundation 4.9 Release Notes] |Supported workloads, layouts, hardware and software requirements, sizing and scaling recommendations -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/planning_your_deployment/index[Planning your OpenShift Container Storage 4.5 deployment] +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/planning_your_deployment[Planning your OpenShift Data Foundation 4.9 deployment] -|Instructions on preparing to deploy when your environment is not directly connected to the internet -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/preparing_to_deploy_in_a_disconnected_environment/index[Preparing to deploy OpenShift Container Storage 4.5 in a disconnected environment] +|Instructions on deploying {rh-storage} to use an external Red Hat Ceph Storage cluster +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_in_external_mode[Deploying OpenShift Data Foundation 4.9 in external mode] -|Instructions on deploying OpenShift Container Storage to use an external Red Hat Ceph Storage cluster -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/deploying_openshift_container_storage_in_external_mode/index[Deploying OpenShift Container Storage 4.5 in external mode] +|Instructions on deploying {rh-storage} to local storage on bare metal infrastructure +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_using_bare_metal_infrastructure[Deploying OpenShift Data Foundation 4.9 using bare metal infrastructure] -|Instructions on deploying OpenShift Container Storage to local storage on bare metal infrastructure -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/deploying_openshift_container_storage_using_bare_metal_infrastructure/index[Deploying OpenShift Container Storage 4.5 using bare metal infrastructure] +|Instructions on deploying {rh-storage} on Red Hat {product-title} VMWare vSphere clusters +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_on_vmware_vsphere[Deploying OpenShift Data Foundation 4.9 on VMWare vSphere] -|Instructions on deploying OpenShift Container Storage on Red Hat {product-title} VMWare vSphere clusters -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/deploying_openshift_container_storage_on_vmware_vsphere/index[Deploying OpenShift Container Storage 4.5 on VMWare vSphere] +|Instructions on deploying {rh-storage} using Amazon Web Services for local or cloud storage +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_using_amazon_web_services[Deploying OpenShift Data Foundation 4.9 using Amazon Web Services] -|Instructions on deploying OpenShift Container Storage using Amazon Web Services for local or cloud storage -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/deploying_openshift_container_storage_using_amazon_web_services/index[Deploying OpenShift Container Storage 4.5 using Amazon Web Services] +|Instructions on deploying and managing {rh-storage} on existing Red Hat {product-title} Google Cloud clusters +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_and_managing_openshift_data_foundation_using_google_cloud[Deploying and managing OpenShift Data Foundation 4.9 using Google Cloud] -|Instructions on deploying and managing OpenShift Container Storage on existing Red Hat {product-title} Google Cloud clusters -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/deploying_and_managing_openshift_container_storage_using_google_cloud/index[Deploying and managing OpenShift Container Storage 4.5 using Google Cloud] +|Instructions on deploying and managing {rh-storage} on existing Red Hat {product-title} Azure clusters +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_using_microsoft_azure_and_azure_red_hat_openshift[Deploying and managing OpenShift Data Foundation 4.9 using Microsoft Azure] -|Instructions on deploying and managing OpenShift Container Storage on existing Red Hat {product-title} Azure clusters -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/deploying_and_managing_openshift_container_storage_using_microsoft_azure/index[Deploying and managing OpenShift Container Storage 4.5 using Microsoft Azure] +|Instructions on deploying {rh-storage} to use local storage on IBM Power infrastructure +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html-single/deploying_openshift_data_foundation_using_ibm_power_systems/index[Deploying OpenShift Data Foundation on IBM Power] -|Managing a Red Hat OpenShift Container Storage 4.5 cluster -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/managing_openshift_container_storage/index[Managing OpenShift Container Storage 4.5] +|Instructions on deploying {rh-storage} to use local storage on IBM Z infrastructure +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_using_ibm_z_infrastructure/index[Deploying OpenShift Data Foundation on IBM Z infrastructure] -|Monitoring a Red Hat OpenShift Container Storage 4.5 cluster -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/monitoring_openshift_container_storage/index[Monitoring Red Hat OpenShift Container Storage 4.5] +|Allocating storage to core services and hosted applications in {rh-storage-first}, including snapshot and clone +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/managing_and_allocating_storage_resources[Managing and allocating resources] + +|Managing storage resources across a hybrid cloud or multicloud environment using the Multicloud Object Gateway (NooBaa) +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/managing_hybrid_and_multicloud_resources[Managing hybrid and multicloud resources] + +|Safely replacing storage devices for {rh-storage-first} +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/replacing_devices[Replacing devices] + +|Safely replacing a node in a {rh-storage-first} cluster +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/replacing_nodes[Replacing nodes] + +|Scaling operations in {rh-storage-first} +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/scaling_storage[Scaling storage] + +|Monitoring a {rh-storage-first} 4.9 cluster +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/monitoring_openshift_data_foundation[Monitoring Red Hat OpenShift Data Foundation 4.9] |Resolve issues encountered during operations -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.5/html/troubleshooting_openshift_container_storage/index[Troubleshooting OpenShift Container Storage 4.5] +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/troubleshooting_openshift_data_foundation[Troubleshooting OpenShift Data Foundation 4.9] |Migrating your {product-title} cluster from version 3 to version 4 -|link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.7/html/migrating_from_version_3_to_4/index[Migration] +|link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.9/html/migrating_from_version_3_to_4/index[Migration] |=== diff --git a/modules/gathering-data-specific-features.adoc b/modules/gathering-data-specific-features.adoc index 33979e6f17..83eef6190f 100644 --- a/modules/gathering-data-specific-features.adoc +++ b/modules/gathering-data-specific-features.adoc @@ -43,8 +43,8 @@ ifdef::openshift-dedicated[] |Data collection for migration-related information. endif::openshift-dedicated[] -|`registry.redhat.io/ocs4/ocs-must-gather-rhel8:v4.10` -|Data collection for Red Hat OpenShift Container Storage. +|`registry.redhat.io/ocs4/ocs-must-gather-rhel8:v4.9` +|Data collection for {rh-storage-first}. |`registry.redhat.io/openshift-logging/cluster-logging-rhel8-operator` |Data collection for OpenShift Logging. @@ -78,7 +78,7 @@ ifdef::openshift-origin[] |Data collection for migration-related information. |`quay.io/ocs-dev/ocs-must-gather` -|Data collection for OpenShift Container Storage. +|Data collection for {rh-storage}. |`quay.io/openshift/origin-cluster-logging-operator` |Data collection for OpenShift Logging. diff --git a/modules/infrastructure-components.adoc b/modules/infrastructure-components.adoc index 6e6c907b28..b4eefcb386 100644 --- a/modules/infrastructure-components.adoc +++ b/modules/infrastructure-components.adoc @@ -16,7 +16,7 @@ The following infrastructure workloads do not incur {product-title} worker subsc * Cluster aggregated logging * Service brokers * Red Hat Quay -* Red Hat OpenShift Container Storage +* {rh-storage-first} * Red Hat Advanced Cluster Manager * Red Hat Advanced Cluster Security for Kubernetes * Red Hat OpenShift GitOps diff --git a/modules/migration-configuring-mcg.adoc b/modules/migration-configuring-mcg.adoc index 2f80f61c3f..cdd6a4ce59 100644 --- a/modules/migration-configuring-mcg.adoc +++ b/modules/migration-configuring-mcg.adoc @@ -14,10 +14,10 @@ ifdef::installing-3-4,installing-mtc[] You must retrieve the Multicloud Object Gateway (MCG) credentials and S3 endpoint in order to configure MCG as a replication repository for the {mtc-full} ({mtc-short}). endif::[] You must retrieve the Multicloud Object Gateway (MCG) credentials in order to create a `Secret` custom resource (CR) for the OpenShift API for Data Protection (OADP). -ifdef::installing-oadp-mcg[] -endif::[] +////ifdef::installing-oadp-mcg[] +////endif::[] -MCG is a component of OpenShift Container Storage. +MCG is a component of {rh-storage}. .Prerequisites ifdef::openshift-origin[] @@ -25,11 +25,11 @@ ifdef::openshift-origin[] + If you have the pull secret, add the `redhat-operators` catalog to the OperatorHub custom resource (CR) as shown in _Configuring {product-title} to use Red Hat Operators_. endif::[] -* You must deploy OpenShift Container Storage by using the appropriate link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.8/[OpenShift Container Storage deployment guide]. +* You must deploy {rh-storage} by using the appropriate link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9[OpenShift Data Foundation deployment guide]. .Procedure -. Obtain the S3 endpoint, `AWS_ACCESS_KEY_ID`, and `AWS_SECRET_ACCESS_KEY` by running the link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.8/html-single/managing_hybrid_and_multicloud_resources/index#accessing-the-Multicloud-object-gateway-from-the-terminal_rhocs[`describe` command] on the `NooBaa` custom resource. +. Obtain the S3 endpoint, `AWS_ACCESS_KEY_ID`, and `AWS_SECRET_ACCESS_KEY` by running the link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/managing_hybrid_and_multicloud_resources/accessing-the-multicloud-object-gateway-with-your-applications_rhodf#accessing-the-Multicloud-object-gateway-from-the-terminal_rhodf[`describe` command] on the `NooBaa` custom resource. ifdef::installing-3-4,installing-mtc[] + You use these credentials to add MCG as a replication repository. diff --git a/modules/persistent-storage-csi-drivers-supported.adoc b/modules/persistent-storage-csi-drivers-supported.adoc index b4dd1e0356..4d083f90d2 100644 --- a/modules/persistent-storage-csi-drivers-supported.adoc +++ b/modules/persistent-storage-csi-drivers-supported.adoc @@ -25,7 +25,7 @@ The following table describes the CSI drivers that are installed with {product-t |Microsoft Azure File (Tech Preview) | - | - | ✅ |Microsoft Azure Stack Hub | ✅ | ✅ | ✅ |OpenStack Cinder | ✅ | ✅ | ✅ -|OpenShift Container Storage | ✅ | ✅ | ✅ +|OpenShift Data Foundation | ✅ | ✅ | ✅ |OpenStack Manila | ✅ | - | - |Red Hat Virtualization (oVirt) | - | - | ✅ |VMware vSphere | - | - | - diff --git a/modules/registry-configuring-storage-baremetal.adoc b/modules/registry-configuring-storage-baremetal.adoc index 9e9eeac080..af74c4ca87 100644 --- a/modules/registry-configuring-storage-baremetal.adoc +++ b/modules/registry-configuring-storage-baremetal.adoc @@ -43,7 +43,7 @@ registry to use storage. ifndef::ibm-z,ibm-power[that uses manually-provisioned {op-system-first} nodes, such as bare metal.] ifdef::ibm-z[on IBM Z.] ifdef::ibm-power[on IBM Power.] -ifndef::ibm-z[* You have provisioned persistent storage for your cluster, such as Red Hat OpenShift Container Storage.] +ifndef::ibm-z[* You have provisioned persistent storage for your cluster, such as {rh-storage-first}.] ifdef::ibm-z[* You have provisioned persistent storage for your cluster.] + [IMPORTANT] diff --git a/modules/registry-configuring-storage-vsphere.adoc b/modules/registry-configuring-storage-vsphere.adoc index 1e8952bc86..f103eefb44 100644 --- a/modules/registry-configuring-storage-vsphere.adoc +++ b/modules/registry-configuring-storage-vsphere.adoc @@ -24,7 +24,7 @@ As a cluster administrator, following installation you must configure your regis * Cluster administrator permissions. * A cluster on VMware vSphere. -* Persistent storage provisioned for your cluster, such as Red Hat OpenShift Container Storage. +* Persistent storage provisioned for your cluster, such as {rh-storage-first}. + [IMPORTANT] ==== diff --git a/modules/security-storage-persistent.adoc b/modules/security-storage-persistent.adoc index c7b24eccec..d7a8b87041 100644 --- a/modules/security-storage-persistent.adoc +++ b/modules/security-storage-persistent.adoc @@ -12,7 +12,7 @@ incorporate storage from any storage back end that supports the CSI interface. {product-title} provides plug-ins for multiple types of storage, including: -* Red Hat OpenShift Container Storage * +* {rh-storage-first} * * AWS Elastic Block Stores (EBS) * * AWS Elastic File System (EFS) * * Azure Disk * diff --git a/modules/storage-persistent-storage-block-volume.adoc b/modules/storage-persistent-storage-block-volume.adoc index 4d45a2797d..3c3b16d62c 100644 --- a/modules/storage-persistent-storage-block-volume.adoc +++ b/modules/storage-persistent-storage-block-volume.adoc @@ -37,7 +37,7 @@ The following table displays which volume plug-ins support block volumes. |iSCSI | ✅ | | ✅ |Local volume | ✅ || ✅ |NFS | | | -|Red Hat OpenShift Container Storage | ✅ | ✅ | ✅ +|{rh-storage-first} | ✅ | ✅ | ✅ |VMware vSphere | ✅ | ✅ | ✅ |=== diff --git a/modules/storage-persistent-storage-pv.adoc b/modules/storage-persistent-storage-pv.adoc index 774c5e1e2b..b497276f3c 100644 --- a/modules/storage-persistent-storage-pv.adoc +++ b/modules/storage-persistent-storage-pv.adoc @@ -55,7 +55,7 @@ ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-aro[] - Local volume - NFS - OpenStack Manila -- Red Hat OpenShift Container Storage +- {rh-storage-first} endif::openshift-enterprise,openshift-webscale,openshift-origin,openshift-aro[] ifdef::openshift-enterprise,openshift-webscale,openshift-origin[] - VMware vSphere @@ -153,7 +153,7 @@ ifdef::openshift-enterprise,openshift-webscale,openshift-origin[] |Local volume | ✅ | - | - |NFS | ✅ | ✅ | ✅ |OpenStack Manila | - | - | ✅ -|Red Hat OpenShift Container Storage | ✅ | - | ✅ +|{rh-storage-first} | ✅ | - | ✅ |VMware vSphere | ✅ | - | - endif::[] @@ -269,7 +269,7 @@ The following PV types support mount options: - iSCSI - Local volume - NFS -- Red Hat OpenShift Container Storage (Ceph RBD only) +- {rh-storage-first} (Ceph RBD only) - VMware vSphere [NOTE] diff --git a/modules/virt-features-for-storage-matrix.adoc b/modules/virt-features-for-storage-matrix.adoc index e11939949c..5f7397cb79 100644 --- a/modules/virt-features-for-storage-matrix.adoc +++ b/modules/virt-features-for-storage-matrix.adoc @@ -15,7 +15,7 @@ |Storage-assisted virtual machine disk cloning |Virtual machine snapshots -|OpenShift Container Storage: RBD block-mode volumes +|{rh-storage}: RBD block-mode volumes |Yes |Yes |Yes @@ -51,7 +51,7 @@ You cannot live migrate virtual machines that use: * A storage class with ReadWriteOnce (RWO) access mode -* Passthrough features such as GPUs +* Passthrough features such as GPUs Do not set the `evictionStrategy` field to `LiveMigrate` for these virtual machines. ==== diff --git a/modules/virt-what-you-can-do-with-virt.adoc b/modules/virt-what-you-can-do-with-virt.adoc index 8d3d0408db..f87a9ea5f0 100644 --- a/modules/virt-what-you-can-do-with-virt.adoc +++ b/modules/virt-what-you-can-do-with-virt.adoc @@ -21,7 +21,7 @@ custom resources to enable virtualization tasks. These tasks include: An enhanced web console provides a graphical portal to manage these virtualized resources alongside the {product-title} cluster containers and infrastructure. -{VirtProductName} is tested with OpenShift Container Storage (OCS) and designed to use with +{VirtProductName} is tested with {rh-storage} (OCS) and designed to use with OCS features for the best experience. // A line about support for OVN and OpenShiftSDN network providers has been moved to the `about-virt` assembly due to xrefs. diff --git a/post_installation_configuration/storage-configuration.adoc b/post_installation_configuration/storage-configuration.adoc index a32352c2af..006b05ba5d 100644 --- a/post_installation_configuration/storage-configuration.adoc +++ b/post_installation_configuration/storage-configuration.adoc @@ -70,8 +70,8 @@ include::modules/available-persistent-storage-options.adoc[leveloffset=+1] include::modules/recommended-configurable-storage-technology.adoc[leveloffset=+1] [id="post-install-deploy-OCS"] -== Deploy Red Hat OpenShift Container Storage +== Deploy Red Hat OpenShift Data Foundation // This section is sourced from storage/persistent_storage/persistent-storage-ocs.adoc -Red Hat OpenShift Container Storage is a provider of agnostic persistent storage for {product-title} supporting file, block, and object storage, either in-house or in hybrid clouds. As a Red Hat storage solution, Red Hat OpenShift Container Storage is completely integrated with {product-title} for deployment, management, and monitoring. +{rh-storage-first} is a provider of agnostic persistent storage for {product-title} supporting file, block, and object storage, either in-house or in hybrid clouds. As a Red Hat storage solution, {rh-storage-first} is completely integrated with {product-title} for deployment, management, and monitoring. include::modules/deploy-red-hat-openshift-container-storage.adoc[leveloffset=+1] diff --git a/storage/persistent_storage/persistent-storage-ocs.adoc b/storage/persistent_storage/persistent-storage-ocs.adoc index c028b87d3a..0e2b011f32 100644 --- a/storage/persistent_storage/persistent-storage-ocs.adoc +++ b/storage/persistent_storage/persistent-storage-ocs.adoc @@ -1,96 +1,93 @@ :_content-type: ASSEMBLY -[id="red-hat-openshift-container-storage"] -= Red Hat OpenShift Container Storage -include::_attributes/common-attributes.adoc[] +[id="red-hat-openshift-data-foundation"] += Red Hat OpenShift Data Foundation +include::modules/common-attributes.adoc[] :context: persistent-storage-ocs toc::[] -Red Hat OpenShift Container Storage is a provider of agnostic persistent storage for {product-title} supporting file, block, and object storage, either in-house or in hybrid clouds. As a Red Hat storage solution, Red Hat OpenShift Container Storage is completely integrated with {product-title} for deployment, management, and monitoring. +{rh-storage-first} is a provider of agnostic persistent storage for {product-title} supporting file, block, and object storage, either in-house or in hybrid clouds. As a Red Hat storage solution, {rh-storage-first} is completely integrated with {product-title} for deployment, management, and monitoring. -Red Hat OpenShift Container Storage provides its own documentation library. The complete set of Red Hat OpenShift Container Storage documentation identified below is available at https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/ +{rh-storage-first} provides its own documentation library. The complete set of {rh-storage-first} documentation identified below is available at https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9. [IMPORTANT] ==== -OpenShift Container Storage on top of Red Hat Hyperconverged Infrastructure (RHHI) for Virtualization, which uses hyperconverged nodes that host virtual machines installed with {product-title}, is not a supported configuration. For more information about supported platforms, see the link:https://access.redhat.com/articles/4731161[Red Hat OpenShift Container Storage Supportability and Interoperability Guide]. +{rh-storage} on top of Red Hat Hyperconverged Infrastructure (RHHI) for Virtualization, which uses hyperconverged nodes that host virtual machines installed with {product-title}, is not a supported configuration. For more information about supported platforms, see the link:https://access.redhat.com/articles/4731161[Red Hat OpenShift Data Foundation Supportability and Interoperability Guide]. ==== [options="header",cols="1,1"] |=== -|If you are looking for Red Hat OpenShift Container Storage information about... -|See the following Red Hat OpenShift Container Storage documentation: +|If you are looking for {rh-storage-first} information about... +|See the following {rh-storage-first} documentation: 2+^| *Planning* |What's new, known issues, notable bug fixes, and Technology Previews -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/4.7_release_notes/[Red Hat OpenShift Container Storage 4.7 Release Notes] +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/4.9_release_notes[Red Hat OpenShift Data Foundation 4.9 Release Notes] |Supported workloads, layouts, hardware and software requirements, sizing and scaling recommendations -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/planning_your_deployment/index[Planning your Red Hat OpenShift Container Storage 4.7 deployment] +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/planning_your_deployment[Planning your Red Hat OpenShift Data Foundation 4.9 deployment] 2+^| *Deploying* -//|Preparing to deploy when your environment is not directly connected to the internet -//|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/preparing_to_deploy_in_a_disconnected_environment/[Preparing to deploy OpenShift Container Storage 4.7 in a disconnected environment] +|Deploying {rh-storage-first} using Amazon Web Services for local or cloud storage +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_using_amazon_web_services[Deploying OpenShift Data Foundation 4.9 using Amazon Web Services] -|Deploying Red Hat OpenShift Container Storage using Amazon Web Services for local or cloud storage -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/deploying_openshift_container_storage_using_amazon_web_services/[Deploying OpenShift Container Storage 4.7 using Amazon Web Services] +|Deploying {rh-storage-first} to local storage on bare metal infrastructure +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_using_bare_metal_infrastructure[Deploying OpenShift Data Foundation 4.9 using bare metal infrastructure] -|Deploying Red Hat OpenShift Container Storage to local storage on bare metal infrastructure -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/deploying_openshift_container_storage_using_bare_metal_infrastructure/[Deploying OpenShift Container Storage 4.7 using bare metal infrastructure] +|Deploying {rh-storage-first} to use an external Red Hat Ceph Storage cluster +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_in_external_mode[Deploying OpenShift Data Foundation 4.9 in external mode] -|Deploying Red Hat OpenShift Container Storage to use an external Red Hat Ceph Storage cluster -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/deploying_openshift_container_storage_in_external_mode/[Deploying OpenShift Container Storage 4.7 in external mode] +|Deploying and managing {rh-storage-first} on existing Google Cloud clusters +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_and_managing_openshift_data_foundation_using_google_cloud[Deploying and managing OpenShift Data Foundation 4.9 using Google Cloud] -|Deploying and managing Red Hat OpenShift Container Storage on existing Google Cloud clusters -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/deploying_and_managing_openshift_container_storage_using_google_cloud/[Deploying and managing OpenShift Container Storage 4.7 using Google Cloud] +|Deploying {rh-storage-first} to use local storage on IBM Z infrastructure +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_using_ibm_z_infrastructure[Deploying OpenShift Data Foundation using IBM Z] -|Deploying Red Hat OpenShift Container Storage to use local storage on IBM Z infrastructure -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/deploying_openshift_container_storage_using_ibm_z_infrastructure/[Deploying OpenShift Container Storage using IBM Z] +|Deploying {rh-storage-first} on IBM Power Systems +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_using_ibm_power_systems[Deploying OpenShift Data Foundation using IBM Power Systems] -|Deploying Red Hat OpenShift Container Storage on IBM Power Systems -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/deploying_openshift_container_storage_using_ibm_power_systems/[Deploying OpenShift Container Storage using IBM Power Systems] +|Deploying {rh-storage-first} on IBM Cloud +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_using_ibm_cloud[Deploying OpenShift Data Foundation using IBM Cloud] -|Deploying Red Hat OpenShift Container Storage on IBM Cloud -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/deploying_openshift_container_storage_using_ibm_cloud/[Deploying OpenShift Container Storage using IBM Cloud] +|Deploying and managing {rh-storage-first} on {rh-openstack-first} +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_and_managing_openshift_data_foundation_using_red_hat_openstack_platform[Deploying and managing OpenShift Data Foundation 4.9 using Red Hat OpenStack Platform] -|Deploying and managing Red Hat OpenShift Container Storage on {rh-openstack-first} -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/deploying_and_managing_openshift_container_storage_using_red_hat_openstack_platform/[Deploying and managing OpenShift Container Storage 4.7 using Red Hat OpenStack Platform] +|Deploying and managing {rh-storage-first} on {rh-virtualization-first} +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_using_red_hat_virtualization_platform[Deploying and managing OpenShift Data Foundation 4.9 using Red Hat Virtualization Platform] -|Deploying and managing Red Hat OpenShift Container Storage on {rh-virtualization-first} -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/deploying_openshift_container_storage_using_red_hat_virtualization_platform/index[Deploying and managing OpenShift Container Storage 4.7 using Red Hat Virtualization Platform] +|Deploying {rh-storage-first} on VMware vSphere clusters +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/deploying_openshift_data_foundation_on_vmware_vsphere[Deploying OpenShift Data Foundation 4.9 on VMware vSphere] -|Deploying Red Hat OpenShift Container Storage on VMware vSphere clusters -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/deploying_openshift_container_storage_on_vmware_vsphere/[Deploying OpenShift Container Storage 4.7 on VMware vSphere] - -|Updating Red Hat OpenShift Container Storage to the latest version -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/updating_openshift_container_storage/[Updating OpenShift Container Storage] +|Updating {rh-storage-first} to the latest version +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/upgrading_to_openshift_data_foundation[Updating OpenShift Data Foundation] 2+^| *Managing* -|Allocating storage to core services and hosted applications in Red Hat OpenShift Container Storage, including snapshot and clone -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/managing_and_allocating_storage_resources/[Managing and allocating resources] +|Allocating storage to core services and hosted applications in {rh-storage-first}, including snapshot and clone +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/managing_and_allocating_storage_resources[Managing and allocating resources] |Managing storage resources across a hybrid cloud or multicloud environment using the Multicloud Object Gateway (NooBaa) -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/managing_hybrid_and_multicloud_resources/[Managing hybrid and multicloud resources] +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/managing_hybrid_and_multicloud_resources[Managing hybrid and multicloud resources] -|Safely replacing storage devices for Red Hat OpenShift Container Storage -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/replacing_devices/[Replacing devices] +|Safely replacing storage devices for {rh-storage-first} +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/replacing_devices[Replacing devices] -|Safely replacing a node in a Red Hat OpenShift Container Storage cluster -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/replacing_nodes/[Replacing nodes] +|Safely replacing a node in a {rh-storage-first} cluster +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/replacing_nodes[Replacing nodes] -|Scaling operations in Red Hat OpenShift Container Storage -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/scaling_storage/[Scaling storage] +|Scaling operations in {rh-storage-first} +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/scaling_storage[Scaling storage] -|Monitoring a Red Hat OpenShift Container Storage 4.7 cluster -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/monitoring_openshift_container_storage/[Monitoring OpenShift Container Storage 4.7] +|Monitoring a {rh-storage-first} 4.9 cluster +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/monitoring_openshift_data_foundation[Monitoring OpenShift Data Foundation 4.9] |Troubleshooting errors and issues -|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_container_storage/4.7/html/troubleshooting_openshift_container_storage/[Troubleshooting OpenShift Container Storage 4.7] +|link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.9/html/troubleshooting_openshift_data_foundation[Troubleshooting OpenShift Data Foundation 4.9] |Migrating your {product-title} cluster from version 3 to version 4 -|link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.7/html/migration_toolkit_for_containers/[Migration Toolkit for Containers] +|link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.9/html/migration_toolkit_for_containers/[Migration Toolkit for Containers] |=== diff --git a/virt/virtual_machines/virtual_disks/virt-managing-vm-snapshots.adoc b/virt/virtual_machines/virtual_disks/virt-managing-vm-snapshots.adoc index ff1fc5a0cf..17f4dfeb00 100644 --- a/virt/virtual_machines/virtual_disks/virt-managing-vm-snapshots.adoc +++ b/virt/virtual_machines/virtual_disks/virt-managing-vm-snapshots.adoc @@ -8,7 +8,7 @@ toc::[] You can create and delete virtual machine (VM) snapshots for VMs, whether the VMs are powered off (offline) or on (online). You can only restore to a powered off (offline) VM. {VirtProductName} supports VM snapshots on the following: -* Red Hat OpenShift Container Storage +* {rh-storage-first} * Any other storage provider with the Container Storage Interface (CSI) driver that supports the Kubernetes Volume Snapshot API Online snapshots have a default time deadline of five minutes (`5m`) that can be changed, if needed. diff --git a/welcome/index.adoc b/welcome/index.adoc index 617fb5342d..6b67c29139 100644 --- a/welcome/index.adoc +++ b/welcome/index.adoc @@ -139,7 +139,7 @@ Internet access is still required to access the cloud APIs and installation medi - **xref:../web_console/web-console.adoc#web-console[Access {product-title}]**: Use credentials output at the end of the installation process to log in to the {product-title} cluster from the command line or web console. -- **xref:../storage/persistent_storage/persistent-storage-ocs.adoc#red-hat-openshift-container-storage[Install Red Hat OpenShift Container Storage]**: You can install Red Hat OpenShift Container Storage as an Operator to provide highly integrated and simplified persistent storage management for containers. +- **xref:../storage/persistent_storage/persistent-storage-ocs.adoc#red-hat-openshift-data-foundation[Install Red Hat OpenShift Data Foundation]**: You can install {rh-storage-first} as an Operator to provide highly integrated and simplified persistent storage management for containers. endif::[] ifndef::openshift-rosa,openshift-dedicated,openshift-dpu[] @@ -247,8 +247,9 @@ rotate these certificates. - **xref:../networking/understanding-networking.adoc#understanding-networking[Manage networking]**: The cluster network in {product-title} is managed by the xref:../networking/cluster-network-operator.adoc#cluster-network-operator[Cluster Network Operator] (CNO). The CNO uses iptables rules in xref:../networking/openshift_sdn/configuring-kube-proxy.adoc#configuring-kube-proxy[kube-proxy] to direct traffic between nodes and pods running on those nodes. The Multus Container Network Interface adds the capability to attach xref:../networking/multiple_networks/understanding-multiple-networks.adoc#understanding-multiple-networks[multiple network interfaces] to a pod. Using xref:../networking/network_policy/about-network-policy.adoc#about-network-policy[network policy] features, you can isolate your pods or permit selected traffic. -- **xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Manage storage]**: {product-title} allows cluster administrators to configure persistent storage using -xref:../storage/persistent_storage/persistent-storage-ocs.adoc#red-hat-openshift-container-storage[Red Hat OpenShift Container Storage], +- **xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Manage storage]**: {product-title} allows cluster administrators to +configure persistent storage using +xref:../storage/persistent_storage/persistent-storage-ocs.adoc#red-hat-openshift-data-foundation[Red Hat OpenShift Data Foundation], xref:../storage/persistent_storage/persistent-storage-aws.adoc#persistent-storage-using-aws-ebs[AWS Elastic Block Store], xref:../storage/persistent_storage/persistent-storage-nfs.adoc#persistent-storage-using-nfs[NFS], xref:../storage/persistent_storage/persistent-storage-iscsi.adoc#persistent-storage-using-iscsi[iSCSI], diff --git a/welcome/oke_about.adoc b/welcome/oke_about.adoc index 98501d3921..51739a2ada 100644 --- a/welcome/oke_about.adoc +++ b/welcome/oke_about.adoc @@ -161,8 +161,8 @@ content from the Red Hat Ecosystem Catalog and Red Hat Connect ISV marketplace. You can access all maintained and curated content that the {product-title} eco-system offers. -=== OpenShift Container Storage compatible -{oke} is compatible and supported with your purchase of OpenShift Container Storage. +=== OpenShift Data Foundation compatible +{oke} is compatible and supported with your purchase of {rh-storage}. === Red Hat Middleware compatible {oke} is compatible and supported with individual Red Hat Middleware product solutions. @@ -313,7 +313,7 @@ s| Feature s| {oke} s| {product-title} s| Operator name | Red Hat Quay | Not Included - Requires separate subscription | Not Included - Requires separate subscription | Quay Operator | Red Hat Advanced Cluster Management | Not Included - Requires separate subscription | Not Included - Requires separate subscription | Advanced Cluster Management for Kubernetes | Red Hat Advanced Cluster Security | Not Included - Requires separate subscription | Not Included - Requires separate subscription | N/A -| OpenShift Container Storage | Not Included - Requires separate subscription | Not Included - Requires separate subscription | OpenShift Container Storage +| {rh-storage} | Not Included - Requires separate subscription | Not Included - Requires separate subscription | {rh-storage} s| Feature s| {oke} s| {product-title} s| Operator name | Ansible Automation Platform Resource Operator | Not Included - Requires separate subscription | Not Included - Requires separate subscription | Ansible Automation Platform Resource Operator | Business Automation provided by Red Hat | Not Included - Requires separate subscription | Not Included - Requires separate subscription | Business Automation Operator