diff --git a/guides/common/assembly_installing-satellite-server-disconnected.adoc b/guides/common/assembly_installing-satellite-server-disconnected.adoc index cab233287a6..6673c4fb180 100644 --- a/guides/common/assembly_installing-satellite-server-disconnected.adoc +++ b/guides/common/assembly_installing-satellite-server-disconnected.adoc @@ -22,13 +22,13 @@ include::modules/proc_disabling-subscription-connection-by-using-web-ui.adoc[lev include::modules/proc_disabling-subscription-connection-by-using-cli.adoc[leveloffset=+1] ifdef::katello,orcharhino,satellite[] -include::modules/con_importing-a-subscription-manifest-into-foreman-server.adoc[leveloffset=+1] +include::modules/con_importing-red-hat-subscription-manifests-into-foreman.adoc[leveloffset=+1] include::modules/proc_obtaining-a-red-hat-subscription-manifest.adoc[leveloffset=+2] -include::modules/proc_importing-red-hat-subscription-manifest-by-using-web-ui.adoc[leveloffset=+2] +include::modules/proc_importing-a-red-hat-subscription-manifest-by-using-web-ui.adoc[leveloffset=+2] -include::modules/proc_importing-red-hat-subscription-manifest-by-using-cli.adoc[leveloffset=+2] +include::modules/proc_importing-a-red-hat-subscription-manifest-by-using-cli.adoc[leveloffset=+2] endif::[] endif::[] diff --git a/guides/common/assembly_installing-server-connected.adoc b/guides/common/assembly_installing-server-connected.adoc index b9e1f7d9588..956fbc9ed34 100644 --- a/guides/common/assembly_installing-server-connected.adoc +++ b/guides/common/assembly_installing-server-connected.adoc @@ -20,12 +20,12 @@ include::modules/proc_installing-project-server-packages.adoc[leveloffset=+1] include::modules/proc_configuring-project-server.adoc[leveloffset=+1] ifdef::katello,orcharhino,satellite[] -include::modules/con_importing-a-subscription-manifest-into-foreman-server.adoc[leveloffset=+1] +include::modules/con_importing-red-hat-subscription-manifests-into-foreman.adoc[leveloffset=+1] include::modules/proc_obtaining-a-red-hat-subscription-manifest.adoc[leveloffset=+2] -include::modules/proc_importing-red-hat-subscription-manifest-by-using-web-ui.adoc[leveloffset=+2] +include::modules/proc_importing-a-red-hat-subscription-manifest-by-using-web-ui.adoc[leveloffset=+2] -include::modules/proc_importing-red-hat-subscription-manifest-by-using-cli.adoc[leveloffset=+2] +include::modules/proc_importing-a-red-hat-subscription-manifest-by-using-cli.adoc[leveloffset=+2] endif::[] endif::[] diff --git a/guides/common/assembly_managing-red-hat-subscriptions.adoc b/guides/common/assembly_managing-red-hat-subscriptions.adoc index 25aabcdadf4..19a442f6be8 100644 --- a/guides/common/assembly_managing-red-hat-subscriptions.adoc +++ b/guides/common/assembly_managing-red-hat-subscriptions.adoc @@ -4,13 +4,13 @@ include::modules/con_managing-red-hat-subscriptions.adoc[] include::modules/proc_tracking-subscription-usage-by-using-the-subscriptions-service.adoc[leveloffset=+1] -include::modules/con_importing-a-subscription-manifest-into-foreman-server.adoc[leveloffset=+1] +include::modules/con_importing-red-hat-subscription-manifests-into-foreman.adoc[leveloffset=+1] include::modules/proc_obtaining-a-red-hat-subscription-manifest.adoc[leveloffset=+2] -include::modules/proc_importing-red-hat-subscription-manifest-by-using-web-ui.adoc[leveloffset=+2] +include::modules/proc_importing-a-red-hat-subscription-manifest-by-using-web-ui.adoc[leveloffset=+2] -include::modules/proc_importing-red-hat-subscription-manifest-by-using-cli.adoc[leveloffset=+2] +include::modules/proc_importing-a-red-hat-subscription-manifest-by-using-cli.adoc[leveloffset=+2] include::modules/proc_locating-a-red-hat-subscription.adoc[leveloffset=+1] @@ -20,4 +20,4 @@ include::modules/proc_removing-red-hat-subscriptions-and-subscription-manifests. include::modules/proc_updating-and-refreshing-red-hat-subscription-manifests.adoc[leveloffset=+1] -include::modules/con_content-delivery-network-structure.adoc[leveloffset=+1] +include::modules/ref_red-hat-cdn-structure.adoc[leveloffset=+1] diff --git a/guides/common/modules/con_importing-a-subscription-manifest-into-foreman-server.adoc b/guides/common/modules/con_importing-red-hat-subscription-manifests-into-foreman.adoc similarity index 66% rename from guides/common/modules/con_importing-a-subscription-manifest-into-foreman-server.adoc rename to guides/common/modules/con_importing-red-hat-subscription-manifests-into-foreman.adoc index a076ab3a825..03702d4b99f 100644 --- a/guides/common/modules/con_importing-a-subscription-manifest-into-foreman-server.adoc +++ b/guides/common/modules/con_importing-red-hat-subscription-manifests-into-foreman.adoc @@ -1,10 +1,10 @@ :_mod-docs-content-type: CONCEPT -[id="Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}"] -= Importing a Red{nbsp}Hat subscription manifest into {ProjectServer} +[id="importing-red-hat-subscription-manifests-into-{project-context}"] += Importing Red{nbsp}Hat subscription manifests into {Project} [role="_abstract"] -Import a Red{nbsp}Hat subscription manifest into {ProjectServer} so that you can enable and synchronize Red{nbsp}Hat repositories. +You can import a Red{nbsp}Hat subscription manifest into {Project} to provide subscription allocation to your organization in {Project}. [NOTE] ==== diff --git a/guides/common/modules/con_managing-red-hat-subscriptions.adoc b/guides/common/modules/con_managing-red-hat-subscriptions.adoc index 51aec719298..bccb433a963 100644 --- a/guides/common/modules/con_managing-red-hat-subscriptions.adoc +++ b/guides/common/modules/con_managing-red-hat-subscriptions.adoc @@ -4,12 +4,14 @@ = Managing Red Hat subscriptions [role="_abstract"] -{ProjectName} can import content from the Red{nbsp}Hat Content Delivery Network (CDN). -{Project} requires a Red{nbsp}Hat subscription manifest to find, access, and download content from the corresponding repositories. -You must have a Red{nbsp}Hat subscription manifest containing a subscription allocation for each organization on {ProjectServer}. -All subscription information is available on the {RHCloud}. +You can import content from the Red{nbsp}Hat Content Delivery Network (CDN) into {ProjectName} by using a Red{nbsp}Hat subscription manifest. +Manage your subscription allocations to ensure each organization can access and download Red{nbsp}Hat repositories. + +A Red{nbsp}Hat subscription manifest contains the information about the subscriptions purchased from Red{nbsp}Hat. +{Project} uses the information in the manifest to access the Red{nbsp}Hat CDN and find what repositories are available for the associated subscription. -Use this chapter to import a Red{nbsp}Hat subscription manifest and manage the manifest within the {ProjectWebUI}. +You must have a Red{nbsp}Hat subscription manifest containing a subscription allocation for each organization in {Project}. +All subscription information is available on the {RHCloud}. Subscription allocations and organizations:: You can manage more than one organization if you have more than one subscription allocation. diff --git a/guides/common/modules/proc_adding-red-hat-subscriptions-to-subscription-manifests.adoc b/guides/common/modules/proc_adding-red-hat-subscriptions-to-subscription-manifests.adoc index 3b06b88e66f..7db940cdbc4 100644 --- a/guides/common/modules/proc_adding-red-hat-subscriptions-to-subscription-manifests.adoc +++ b/guides/common/modules/proc_adding-red-hat-subscriptions-to-subscription-manifests.adoc @@ -4,15 +4,18 @@ = Adding Red Hat subscriptions to subscription manifests [role="_abstract"] -Use the following procedure to add Red Hat subscriptions to a subscription manifest in the {ProjectWebUI}. +You can add Red{nbsp}Hat subscriptions to your subscription manifest in {Project} to allocate entitlements to Red{nbsp}Hat content in your organization. + +If you have exported a new subscription manifest from the {RHCloud}, you have to populate the manifest with subscriptions. +Such a manifest does not initially contain any subscriptions. .Prerequisites -* You must have a Red{nbsp}Hat subscription manifest file imported to {ProjectServer}. -For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[]. +* A Red{nbsp}Hat subscription manifest is imported to {Project}. +For more information, see xref:importing-red-hat-subscription-manifests-into-{project-context}[]. .Procedure . In the {ProjectWebUI}, ensure the context is set to the organization you want to use. -. In the {ProjectWebUI}, navigate to *Content* > *Subscriptions*. -. In the Subscriptions window, click *Add Subscriptions*. +. Navigate to *Content* > *Subscriptions*. +. On the *Subscriptions* page, click *Add Subscriptions*. . On the row of each subscription you want to add, enter the quantity in the *Quantity to Allocate* column. -. Click *Submit* +. Click *Submit*. diff --git a/guides/common/modules/proc_configuring-projectserver-to-synchronize-content-over-a-network-by-using-cli.adoc b/guides/common/modules/proc_configuring-projectserver-to-synchronize-content-over-a-network-by-using-cli.adoc index 168e0cae8f0..d1de6304bdb 100644 --- a/guides/common/modules/proc_configuring-projectserver-to-synchronize-content-over-a-network-by-using-cli.adoc +++ b/guides/common/modules/proc_configuring-projectserver-to-synchronize-content-over-a-network-by-using-cli.adoc @@ -9,7 +9,7 @@ Configure a downstream {ProjectServer} to synchronize repositories from a connec .Prerequisites * A network connection exists between the upstream {ProjectServer} and the downstream {ProjectServer}. * You imported the same subscription manifest on both the upstream and downstream {ProjectServer}. -For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[]. +For more information, see xref:importing-red-hat-subscription-manifests-into-{project-context}[]. * On the upstream {ProjectServer}, you enabled the required repositories for the organization. For more information, see {ContentManagementDocURL}enabling-red-hat-repositories-by-using-web-ui[Enabling Red Hat Repositories] in _{ContentManagementDocTitle}_. * The upstream user is an admin or has the following permissions: diff --git a/guides/common/modules/proc_configuring-projectserver-to-synchronize-content-over-a-network-by-using-web-ui.adoc b/guides/common/modules/proc_configuring-projectserver-to-synchronize-content-over-a-network-by-using-web-ui.adoc index 5264779a455..fb6a64710ff 100644 --- a/guides/common/modules/proc_configuring-projectserver-to-synchronize-content-over-a-network-by-using-web-ui.adoc +++ b/guides/common/modules/proc_configuring-projectserver-to-synchronize-content-over-a-network-by-using-web-ui.adoc @@ -9,7 +9,7 @@ Configure a downstream {ProjectServer} to synchronize repositories from a connec .Prerequisites * A network connection exists between the upstream {ProjectServer} and the downstream {ProjectServer}. * You imported the same subscription manifest on both the upstream and downstream {ProjectServer}. -For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[]. +For more information, see xref:importing-red-hat-subscription-manifests-into-{project-context}[]. * On the upstream {ProjectServer}, you enabled the required repositories for the organization. For more information, see {ContentManagementDocURL}enabling-red-hat-repositories-by-using-web-ui[Enabling Red Hat Repositories] in _{ContentManagementDocTitle}_. * The upstream user is an admin or has the following permissions: diff --git a/guides/common/modules/proc_enabling-the-project-client-name-repository.adoc b/guides/common/modules/proc_enabling-the-project-client-name-repository.adoc index a842534e589..e9b4675bbd6 100644 --- a/guides/common/modules/proc_enabling-the-project-client-name-repository.adoc +++ b/guides/common/modules/proc_enabling-the-project-client-name-repository.adoc @@ -9,7 +9,7 @@ After enabling a Red Hat repository, {Project} creates a product for this reposi .Prerequisites * Ensure that a subscription manifest has been imported to your organization. -For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[]. +For more information, see xref:importing-red-hat-subscription-manifests-into-{project-context}[]. .Procedure . In the {ProjectWebUI}, navigate to *Content* > *Red Hat Repositories*. diff --git a/guides/common/modules/proc_importing-red-hat-subscription-manifest-by-using-cli.adoc b/guides/common/modules/proc_importing-a-red-hat-subscription-manifest-by-using-cli.adoc similarity index 56% rename from guides/common/modules/proc_importing-red-hat-subscription-manifest-by-using-cli.adoc rename to guides/common/modules/proc_importing-a-red-hat-subscription-manifest-by-using-cli.adoc index afb5e6e7840..67cdd0f4817 100644 --- a/guides/common/modules/proc_importing-red-hat-subscription-manifest-by-using-cli.adoc +++ b/guides/common/modules/proc_importing-a-red-hat-subscription-manifest-by-using-cli.adoc @@ -1,14 +1,15 @@ :_mod-docs-content-type: PROCEDURE -[id="importing-red-hat-subscription-manifest-by-using-cli"] -= Importing Red Hat subscription manifest by using Hammer CLI +[id="importing-a-red-hat-subscription-manifest-by-using-cli"] += Importing a Red Hat subscription manifest by using Hammer CLI [role="_abstract"] You can import a Red{nbsp}Hat subscription manifest into {ProjectServer} by using Hammer CLI. +Import the manifest so that you can enable and synchronize Red{nbsp}Hat repositories in your organization. .Prerequisites -* You must have a Red{nbsp}Hat subscription manifest file. -For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[]. +* You have a Red{nbsp}Hat subscription manifest file. +For more information, see xref:obtaining-a-red-hat-subscription-manifest[]. .Procedure . Copy the Red{nbsp}Hat subscription manifest file from your local machine to {ProjectServer}: @@ -27,6 +28,13 @@ $ hammer subscription upload \ --organization "_My_Organization_" ---- +ifdef::content-management[] +.Next steps +* If you use the manifest from the {RHCloud}, add subscriptions to the manifest. +For more information, see xref:Adding_Red_Hat_Subscriptions_to_Subscription_Manifests_{context}[]. +endif::[] +ifeval::["{mode}" == "disconnected"] .Next steps * You can now enable and synchronize Red{nbsp}Hat repositories. For more information, see {ContentManagementDocURL}Importing_Content_content-management[Importing content] in _{ContentManagementDocTitle}_. +endif::[] diff --git a/guides/common/modules/proc_importing-a-red-hat-subscription-manifest-by-using-web-ui.adoc b/guides/common/modules/proc_importing-a-red-hat-subscription-manifest-by-using-web-ui.adoc new file mode 100644 index 00000000000..05490dfc9e9 --- /dev/null +++ b/guides/common/modules/proc_importing-a-red-hat-subscription-manifest-by-using-web-ui.adoc @@ -0,0 +1,30 @@ +:_mod-docs-content-type: PROCEDURE + +[id="importing-a-red-hat-subscription-manifest-by-using-web-ui"] += Importing a Red Hat subscription manifest by using {ProjectWebUI} + +[role="_abstract"] +You can import a Red{nbsp}Hat subscription manifest into {ProjectServer} by using {ProjectWebUI}. +Import the manifest so that you can enable and synchronize Red{nbsp}Hat repositories in your organization. + +.Prerequisites +* You have a Red{nbsp}Hat subscription manifest file. +For more information, see xref:obtaining-a-red-hat-subscription-manifest[]. + +.Procedure +. In the {ProjectWebUI}, ensure the context is set to the organization you want to use. +. Navigate to *Content* > *Subscriptions*. +. Click *Manage Manifest*. +. In the *Manage Manifest* window, click *Choose File*. +. Navigate to the location that contains the Red{nbsp}Hat subscription manifest file, then click *Open*. + +ifdef::content-management[] +.Next steps +* If you use the manifest from the {RHCloud}, add subscriptions to the manifest. +For more information, see xref:Adding_Red_Hat_Subscriptions_to_Subscription_Manifests_{context}[]. +endif::[] +ifeval::["{mode}" == "disconnected"] +.Next steps +* You can now enable and synchronize Red{nbsp}Hat repositories. +For more information, see {ContentManagementDocURL}Importing_Content_content-management[Importing content] in _{ContentManagementDocTitle}_. +endif::[] diff --git a/guides/common/modules/proc_importing-red-hat-subscription-manifest-by-using-web-ui.adoc b/guides/common/modules/proc_importing-red-hat-subscription-manifest-by-using-web-ui.adoc deleted file mode 100644 index eed6024e9eb..00000000000 --- a/guides/common/modules/proc_importing-red-hat-subscription-manifest-by-using-web-ui.adoc +++ /dev/null @@ -1,22 +0,0 @@ -:_mod-docs-content-type: PROCEDURE - -[id="importing-red-hat-subscription-manifest-by-using-web-ui"] -= Importing Red Hat subscription manifest by using {ProjectWebUI} - -[role="_abstract"] -You can import a Red{nbsp}Hat subscription manifest into {ProjectServer} by using {ProjectWebUI}. - -.Prerequisites -* You must have a Red{nbsp}Hat subscription manifest file. -For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[]. - -.Procedure -. In the {ProjectWebUI}, ensure the context is set to the organization you want to use. -. In the {ProjectWebUI}, navigate to *Content* > *Subscriptions*. -. Click *Manage Manifest*. -. In the *Manage Manifest* window, click *Choose File*. -. Navigate to the location that contains the Red{nbsp}Hat subscription manifest file, then click *Open*. - -.Next steps -* You can now enable and synchronize Red{nbsp}Hat repositories. -For more information, see {ContentManagementDocURL}Importing_Content_content-management[Importing content] in _{ContentManagementDocTitle}_. diff --git a/guides/common/modules/proc_locating-a-red-hat-subscription.adoc b/guides/common/modules/proc_locating-a-red-hat-subscription.adoc index 77fe4094c68..2ad62443539 100644 --- a/guides/common/modules/proc_locating-a-red-hat-subscription.adoc +++ b/guides/common/modules/proc_locating-a-red-hat-subscription.adoc @@ -4,12 +4,11 @@ = Locating a Red Hat subscription [role="_abstract"] -When you import a Red{nbsp}Hat subscription manifest into {ProjectServer}, the subscriptions from your manifest are listed in the Subscriptions window. -If you have a high volume of subscriptions, you can filter the results to find a specific subscription. +You can locate specific Red{nbsp}Hat subscriptions in your {Project} by filtering the results on the Subscriptions page to navigate a high volume of subscriptions. .Prerequisites -* You must have a Red{nbsp}Hat subscription manifest file imported to {ProjectServer}. -For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[]. +* A Red{nbsp}Hat subscription manifest is imported to {Project}. +For more information, see xref:importing-red-hat-subscription-manifests-into-{project-context}[]. .Procedure . In the {ProjectWebUI}, ensure the context is set to the organization you want to use. diff --git a/guides/common/modules/proc_obtaining-a-red-hat-subscription-manifest.adoc b/guides/common/modules/proc_obtaining-a-red-hat-subscription-manifest.adoc index 8c0059aff99..c67ebff548b 100644 --- a/guides/common/modules/proc_obtaining-a-red-hat-subscription-manifest.adoc +++ b/guides/common/modules/proc_obtaining-a-red-hat-subscription-manifest.adoc @@ -4,7 +4,7 @@ = Obtaining a Red{nbsp}Hat subscription manifest [role="_abstract"] -You need to create and export a Red{nbsp}Hat subscription manifest before you can import it into your {ProjectServer}. +You can create and export a Red{nbsp}Hat subscription manifest to prepare subscriptions for import into {Project}. .Procedure ifeval::["{mode}" == "connected"] @@ -25,10 +25,15 @@ ifdef::content-management[] ifndef::orcharhino[] For more information, see {RHDocsBaseURL}subscription_central/1-latest/html-single/creating_and_managing_manifests_for_a_connected_satellite_server/index[Creating and managing manifests for a connected Satellite Server] in _Subscription Central_. endif::[] ++ +This manifest does not yet contain any subscriptions. +After you import the manifest into {Project}, add subscriptions to the manifest in {Project}. * If your {Project} is disconnected, use the Red{nbsp}Hat Customer Portal to create and export the manifest. ifndef::orcharhino[] For more information, see {RHDocsBaseURL}subscription_central/1-latest/html-single/creating_and_managing_manifests_for_a_disconnected_satellite_server/index[Creating and managing manifests for a disconnected Satellite Server] in _Subscription Central_. endif::[] ++ +This manifest already contains subscriptions. endif::[] ifeval::["{mode}" == "disconnected"] . Disable subscription connection on your {ProjectServer}. diff --git a/guides/common/modules/proc_removing-red-hat-subscriptions-and-subscription-manifests.adoc b/guides/common/modules/proc_removing-red-hat-subscriptions-and-subscription-manifests.adoc index 4787c156ca4..b28e51ab102 100644 --- a/guides/common/modules/proc_removing-red-hat-subscriptions-and-subscription-manifests.adoc +++ b/guides/common/modules/proc_removing-red-hat-subscriptions-and-subscription-manifests.adoc @@ -4,7 +4,7 @@ = Removing Red Hat subscriptions from subscription manifests [role="_abstract"] -Use the following procedure to remove Red Hat subscriptions from a subscription manifest in the {ProjectWebUI}. +You can remove Red{nbsp}Hat subscriptions from manifests to adjust entitlement allocations or decommission Red{nbsp}Hat products from your organization. [WARNING] ==== @@ -13,11 +13,11 @@ If you delete the manifest from the Red Hat Customer Portal or in the {ProjectWe ==== .Prerequisites -* You must have a Red{nbsp}Hat subscription manifest file imported to {ProjectServer}. -For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[]. +* A Red{nbsp}Hat subscription manifest is imported to {Project}. +For more information, see xref:importing-red-hat-subscription-manifests-into-{project-context}[]. .Procedure . In the {ProjectWebUI}, ensure the context is set to the organization you want to use. -. In the {ProjectWebUI}, navigate to *Content* > *Subscriptions*. +. Navigate to *Content* > *Subscriptions*. . On the row of each subscription you want to remove, select the corresponding checkbox. . Click *Delete*, and then confirm deletion. diff --git a/guides/common/modules/proc_tracking-subscription-usage-by-using-the-subscriptions-service.adoc b/guides/common/modules/proc_tracking-subscription-usage-by-using-the-subscriptions-service.adoc index 58f3624a84a..da3692296df 100644 --- a/guides/common/modules/proc_tracking-subscription-usage-by-using-the-subscriptions-service.adoc +++ b/guides/common/modules/proc_tracking-subscription-usage-by-using-the-subscriptions-service.adoc @@ -4,11 +4,13 @@ = Tracking subscription usage by using the Subscriptions service [role="_abstract"] -You can configure your {ProjectServer} to report usage data to the {RHCloud} by using the `foreman_rh_cloud` plugin. +You can configure your {ProjectServer} to report usage data to the {RHCloud}. +Track and manage your subscription usage to analyze historical trends for planning and compliance. ifndef::satellite[] .Prerequisites -* Enable the `foreman_rh_cloud` plugin: +* The `foreman_rh_cloud` plugin is enabled on {ProjectServer}. +You can enable the plugin by running `{foreman-installer}`: + [options="nowrap", subs="+quotes,verbatim,attributes"] ---- diff --git a/guides/common/modules/proc_updating-and-refreshing-red-hat-subscription-manifests.adoc b/guides/common/modules/proc_updating-and-refreshing-red-hat-subscription-manifests.adoc index bb130546681..fcc078c7f80 100644 --- a/guides/common/modules/proc_updating-and-refreshing-red-hat-subscription-manifests.adoc +++ b/guides/common/modules/proc_updating-and-refreshing-red-hat-subscription-manifests.adoc @@ -4,7 +4,10 @@ = Updating and refreshing Red Hat subscription manifests [role="_abstract"] -Every time that you change a subscription allocation, you must refresh the manifest to reflect these changes. +You can refresh your Red{nbsp}Hat subscription manifests to keep your subscription allocations up to date. +Refresh your manifests after renewing, adjusting, or purchasing subscriptions to ensure accurate entitlements in your {Project}. + +Every time you change a subscription allocation, you must refresh the manifest to reflect these changes. For example, you must refresh the manifest if you take any of the following actions: * Renewing a subscription @@ -16,11 +19,15 @@ Alternatively, you can import an updated manifest that contains the changes. The {ProjectWebUI} provides a notification before the subscription manifest expires. +.Prerequisites +* A Red{nbsp}Hat subscription manifest is imported to {Project}. +For more information, see xref:importing-red-hat-subscription-manifests-into-{project-context}[]. + .Procedure . In the {ProjectWebUI}, ensure the context is set to the organization you want to use. -. In the {ProjectWebUI}, navigate to *Content* > *Subscriptions*. -. In the Subscriptions window, click *Manage Manifest*. -. In the Manage Manifest window, click *Refresh*. +. Navigate to *Content* > *Subscriptions*. +. On the *Subscriptions* page, click *Manage Manifest*. +. In the *Manage Manifest* window, click *Refresh*. ifdef::satellite[] .Additional resources diff --git a/guides/common/modules/con_content-delivery-network-structure.adoc b/guides/common/modules/ref_red-hat-cdn-structure.adoc similarity index 62% rename from guides/common/modules/con_content-delivery-network-structure.adoc rename to guides/common/modules/ref_red-hat-cdn-structure.adoc index bc845a086e2..38b5f71fa2f 100644 --- a/guides/common/modules/con_content-delivery-network-structure.adoc +++ b/guides/common/modules/ref_red-hat-cdn-structure.adoc @@ -1,21 +1,16 @@ -:_mod-docs-content-type: CONCEPT +:_mod-docs-content-type: REFERENCE -[id="Content_Delivery_Network_Structure_{context}"] -= Content Delivery Network structure - -ifdef::katello,orcharhino[] -[NOTE] -==== -Information in this section only applies if you consume Red{nbsp}Hat content by using a Red{nbsp}Hat manifest. -==== -endif::[] +[id="red-hat-cdn-structure"] += Red{nbsp}Hat CDN structure [role="_abstract"] -Red{nbsp}Hat Content Delivery Network (CDN), located at `cdn.redhat.com`, is a geographically distributed series of static webservers which include content and errata designed to be used by systems. -This content can be accessed directly through a system registered by using Subscription Manager or through the {ProjectWebUI}. -The accessible subset of the CDN is configured through content available to a system by using https://access.redhat.com/management/[Red{nbsp}Hat Subscription Management] or by using {ProjectServer}. +The Red{nbsp}Hat Content Delivery Network (CDN) is a geographically distributed series of static web servers providing Red{nbsp}Hat software. +You can access this content directly through Subscription Manager or {ProjectServer}. -Red{nbsp}Hat Content Delivery network is protected by X.509 certificate authentication to ensure that only valid users can access it. +The Red{nbsp}Hat CDN is located at `cdn.redhat.com`. +{Project} and Subscription Manager configure which content is accessible to your hosts based on your subscription entitlements. +{Project} must authenticate to the Red{nbsp}Hat CDN by using X.509 certificate authentication. +The certificate is part of a subscription manifest. .Directory structure of the Red{nbsp}Hat CDN ====