Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow-up PR to "deployment paths PR" #3520

Merged
merged 4 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions guides/common/assembly_deployment-path.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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::[]

Expand Down
11 changes: 1 addition & 10 deletions guides/common/assembly_using-external-databases.adoc
Original file line number Diff line number Diff line change
@@ -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]

Expand All @@ -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:]
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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::[]
6 changes: 6 additions & 0 deletions guides/common/modules/con_defining-your-content-library.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 5 additions & 0 deletions guides/common/modules/con_using-external-databases.adoc
Original file line number Diff line number Diff line change
@@ -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.