From 5729f70d0f50d29ce0ee49e402ca17b6df1fcc8e Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Thu, 12 Dec 2024 14:41:33 +0100 Subject: [PATCH 1/4] Use sentence capitalization for links --- ...n_configuring-project-server-with-external-database.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guides/common/modules/con_configuring-project-server-with-external-database.adoc b/guides/common/modules/con_configuring-project-server-with-external-database.adoc index 14ed782c23..5bf2f8b89b 100644 --- a/guides/common/modules/con_configuring-project-server-with-external-database.adoc +++ b/guides/common/modules/con_configuring-project-server-with-external-database.adoc @@ -25,11 +25,11 @@ This requires {Project} to create a record in PostgreSQL for each job. ifeval::["{context}" == "planning"] .Additional resources ifndef::satellite[] -* For more information about using an external database, see {InstallingServerDocURL}using-external-databases_{project-context}[Using External Databases with {Project}] in _{InstallingServerDocTitle}_. +* For more information about using an external database, see {InstallingServerDocURL}using-external-databases_{project-context}[Using external databases with {Project}] in _{InstallingServerDocTitle}_. endif::[] ifdef::satellite[] * For more information about using an external database, see the following documents: -** {InstallingServerDocURL}using-external-databases_{project-context}[Using External Databases with {Project}] in _{InstallingServerDocTitle}_ -** {InstallingServerDisconnectedDocURL}using-external-databases_{project-context}[Using External Databases with {Project}] in _{InstallingServerDisconnectedDocTitle}_ +** {InstallingServerDocURL}using-external-databases_{project-context}[Using external databases with {Project}] in _{InstallingServerDocTitle}_ +** {InstallingServerDisconnectedDocURL}using-external-databases_{project-context}[Using external databases with {Project}] in _{InstallingServerDisconnectedDocTitle}_ endif::[] endif::[] From e808324ef863c5db5ba1730d33b6f38535eb8b6a Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Thu, 12 Dec 2024 14:48:29 +0100 Subject: [PATCH 2/4] Import RH manifest on Katello For katello and orcharhino builds, importing a RH manifest is only required if you provide content to RHEL hosts. --- guides/common/assembly_deployment-path.adoc | 6 +----- .../con_adding-a-red-hat-subscription-to-project.adoc | 8 ++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/guides/common/assembly_deployment-path.adoc b/guides/common/assembly_deployment-path.adoc index 7187cf8d2b..232b215886 100644 --- a/guides/common/assembly_deployment-path.adoc +++ b/guides/common/assembly_deployment-path.adoc @@ -12,15 +12,11 @@ include::modules/con_planning-organization-and-location-context.adoc[leveloffset include::modules/con_installing-smart-proxy-servers.adoc[leveloffset=+1] -ifdef::satellite[] +ifdef::katello,orcharhino,satellite[] include::modules/con_adding-a-red-hat-subscription-to-project.adoc[leveloffset=+1] -endif::[] -ifdef::katello,orcharhino,satellite[] include::modules/con_defining-your-content-library.adoc[leveloffset=+1] -endif::[] -ifdef::katello,orcharhino,satellite[] include::modules/con_defining-content-access-strategies-for-hosts.adoc[leveloffset=+1] endif::[] diff --git a/guides/common/modules/con_adding-a-red-hat-subscription-to-project.adoc b/guides/common/modules/con_adding-a-red-hat-subscription-to-project.adoc index c7b2bde1bd..aad6fa4530 100644 --- a/guides/common/modules/con_adding-a-red-hat-subscription-to-project.adoc +++ b/guides/common/modules/con_adding-a-red-hat-subscription-to-project.adoc @@ -1,6 +1,14 @@ [id="adding-a-red-hat-subscription-to-project-{context}"] = Adding a Red{nbsp}Hat subscription to {Project} +ifdef::katello,orcharhino[] +[NOTE] +==== +If you want to manage hosts running {RHEL}, import a Red{nbsp}Hat manifest. +For more information, see {ContentManagementDocURL}Managing_Red_Hat_Subscriptions_content-management[Managing Red Hat subscriptions] in _{ContentManagementDocTitle}_. +==== +endif::[] + A Red{nbsp}Hat subscription manifest is a set of encrypted files that contains your subscription information. {ProjectServer} uses this information to access the Red{nbsp}Hat CDN and find what repositories are available for the associated subscription. From 149f0caa3420e5707146b37caf319b564ff0acf6 Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Thu, 12 Dec 2024 14:51:58 +0100 Subject: [PATCH 3/4] Move content from assembly to concept --- guides/common/assembly_using-external-databases.adoc | 11 +---------- ...iguring-project-server-with-external-database.adoc | 6 +++--- .../common/modules/con_using-external-databases.adoc | 5 +++++ 3 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 guides/common/modules/con_using-external-databases.adoc diff --git a/guides/common/assembly_using-external-databases.adoc b/guides/common/assembly_using-external-databases.adoc index f2e99b3a3b..050843bc20 100644 --- a/guides/common/assembly_using-external-databases.adoc +++ b/guides/common/assembly_using-external-databases.adoc @@ -1,10 +1,4 @@ -ifdef::context[:parent-context: {context}] - -[id="using-external-databases_{context}"] -= Using external databases with {Project} - -The {Project} installation process includes installing a PostgreSQL database on the same host as {ProjectServer}. -In certain {Project} deployments, using external databases instead of the default local databases can help with the server load. +include::modules/con_using-external-databases.adoc[] include::modules/con_configuring-project-server-with-external-database.adoc[leveloffset=+1] @@ -15,6 +9,3 @@ include::modules/proc_preparing-a-host-for-external-databases.adoc[leveloffset=+ include::modules/proc_installing-postgresql.adoc[leveloffset=+1] include::modules/proc_configuring-satellite-to-use-external-databases.adoc[leveloffset=+1] - -ifdef::parent-context[:context: {parent-context}] -ifndef::parent-context[:!context:] diff --git a/guides/common/modules/con_configuring-project-server-with-external-database.adoc b/guides/common/modules/con_configuring-project-server-with-external-database.adoc index 5bf2f8b89b..b549ba3755 100644 --- a/guides/common/modules/con_configuring-project-server-with-external-database.adoc +++ b/guides/common/modules/con_configuring-project-server-with-external-database.adoc @@ -25,11 +25,11 @@ This requires {Project} to create a record in PostgreSQL for each job. ifeval::["{context}" == "planning"] .Additional resources ifndef::satellite[] -* For more information about using an external database, see {InstallingServerDocURL}using-external-databases_{project-context}[Using external databases with {Project}] in _{InstallingServerDocTitle}_. +* For more information about using an external database, see {InstallingServerDocURL}using-external-databases[Using external databases with {Project}] in _{InstallingServerDocTitle}_. endif::[] ifdef::satellite[] * For more information about using an external database, see the following documents: -** {InstallingServerDocURL}using-external-databases_{project-context}[Using external databases with {Project}] in _{InstallingServerDocTitle}_ -** {InstallingServerDisconnectedDocURL}using-external-databases_{project-context}[Using external databases with {Project}] in _{InstallingServerDisconnectedDocTitle}_ +** {InstallingServerDocURL}using-external-databases[Using external databases with {Project}] in _{InstallingServerDocTitle}_ +** {InstallingServerDisconnectedDocURL}using-external-databases[Using external databases with {Project}] in _{InstallingServerDisconnectedDocTitle}_ endif::[] endif::[] diff --git a/guides/common/modules/con_using-external-databases.adoc b/guides/common/modules/con_using-external-databases.adoc new file mode 100644 index 0000000000..c0ce7f8100 --- /dev/null +++ b/guides/common/modules/con_using-external-databases.adoc @@ -0,0 +1,5 @@ +[id="using-external-databases"] += Using external databases with {Project} + +The {Project} installation process includes installing a PostgreSQL database on the same host as {ProjectServer}. +In certain {Project} deployments, using external databases instead of the default local databases can help with the server load. From d444803bd1a3279e98f6d7aeff5ca5122b7a5832 Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Thu, 12 Dec 2024 15:01:03 +0100 Subject: [PATCH 4/4] Add SUSE content for katello to Planning guide --- .../common/modules/con_defining-your-content-library.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guides/common/modules/con_defining-your-content-library.adoc b/guides/common/modules/con_defining-your-content-library.adoc index df1ac8b6fc..6a0ebff7fa 100644 --- a/guides/common/modules/con_defining-your-content-library.adoc +++ b/guides/common/modules/con_defining-your-content-library.adoc @@ -11,6 +11,12 @@ For example, {RHEL}{nbsp}Server is a product in {Project}. The repositories for the {RHEL}{nbsp}Server product consist of different versions, architectures, and add-ons. When you enable a Red{nbsp}Hat repository, {Project} automatically creates an associated product. +ifdef::katello,orcharhino[] +SUSE content:: +You can use {Project} to manage hosts running {SLES}. +For more information, see {ContentManagementDocURL}Managing_SUSE_Content_content-management[Managing SUSE content] in _{ContentManagementDocTitle}_. +endif::[] + Other sources of content:: To distribute content from custom sources, you must create products and repositories manually. You can organize other content into {customproduct}s however you want.