Skip to content

Commit cdc11ce

Browse files
committed
Exclude content-related content for EL and Deb (#4250)
(cherry picked from commit bc27701)
1 parent 35b04bb commit cdc11ce

8 files changed

+44
-13
lines changed

guides/common/assembly_common-deployment-scenarios.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@ include::modules/con_common-deployment-scenarios.adoc[]
44

55
include::modules/con_single-location-with-segregated-subnets.adoc[leveloffset=+1]
66

7+
ifdef::katello,orcharhino,satellite[]
78
include::modules/con_multiple-locations.adoc[leveloffset=+1]
89

9-
ifdef::katello,orcharhino,satellite[]
1010
include::modules/con_content-view-scenarios.adoc[leveloffset=+1]
1111

1212
include::modules/con_projectserver-with-multiple-manifests.adoc[leveloffset=+1]
13-
endif::[]
1413

1514
include::modules/con_host-group-structures.adoc[leveloffset=+1]
1615

17-
ifdef::katello,orcharhino,satellite[]
1816
include::modules/con_iss-scenarios.adoc[leveloffset=+1]
1917
endif::[]
2018

guides/common/assembly_tools-for-administration-of-project.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ include::modules/con_remote-execution-in-project.adoc[leveloffset=+1]
1212

1313
include::modules/con_automating-project-management-with-project-ansible-collection.adoc[leveloffset=+1]
1414

15-
ifndef::foreman-deb,orcharhino[]
15+
ifdef::katello,satellite[]
1616
include::modules/con_kickstart-workflow.adoc[leveloffset=+1]
1717
endif::[]

guides/common/modules/con_configuring-project-server-with-external-database.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,14 @@ Consider using external databases if you plan to use your {Project} deployment f
1919

2020
* Frequent remote execution tasks.
2121
This requires a high volume of records in PostgreSQL and generates heavy database workloads.
22+
ifdef::katello,orcharhino,satellite[]
2223
* High disk I/O workloads from frequent repository synchronization or content view publishing.
2324
This requires {Project} to create a record in PostgreSQL for each job.
25+
endif::[]
2426
* High volume of hosts.
27+
ifdef::katello,orcharhino,satellite[]
2528
* High volume of synchronized content.
29+
endif::[]
2630

2731
ifeval::["{context}" == "planning"]
2832
.Additional resources

guides/common/modules/con_major-project-components.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
[id="Major-{Project}-Components_{context}"]
44
= Major {Project} components
55

6-
A typical {Project} deployment consists of the following components: a {ProjectServer}, {SmartProxyServers} that mirror content from {ProjectServer}, and hosts that receive content and configuration from {ProjectServer} and {SmartProxyServers}.
6+
A typical {Project} deployment consists of the following components: a {ProjectServer}, {SmartProxyServers}, and hosts that receive
7+
ifdef::katello,orcharhino,satellite[]
8+
content and
9+
endif::[]
10+
configuration from {ProjectServer} and {SmartProxyServers}.

guides/common/modules/con_multiple-locations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This practice can save bandwidth since hosts obtain content from a local {SmartP
88
Synchronization of content from remote repositories is done only by the {SmartProxy}, not by each host in a location.
99
In addition, this layout makes the provisioning infrastructure more reliable and easier to configure.
1010

11-
ifdef::foreman-el,foreman-deb,katello[]
11+
ifdef::katello[]
1212
image::common/planning-for-foreman-system-architecture.svg[Content flow in {ProjectName}]
1313
endif::[]
1414
ifdef::orcharhino[]

guides/common/modules/con_overview-of-hosts-in-project.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,9 @@ ifdef::orcharhino[]
1717
such as Amazon EC2, Google Compute Engine, libvirt, Microsoft Azure, Proxmox, and VMware vSphere.
1818
endif::[]
1919

20-
With {Project}, you can manage hosts at scale, including monitoring, provisioning, remote execution, configuration management, software management, and subscription management.
20+
With {Project}, you can manage hosts at scale, including monitoring, provisioning, remote execution,
21+
ifdef::katello,orcharhino,satellite[]
22+
subscription management, content management,
23+
endif::[]
24+
and configuration management.
2125
You can also group hosts by using features such as host groups and host collections.

guides/common/modules/con_planning-organization-and-location-context.adoc

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ Context in {Project} consists of organizations and locations.
77
You can associate most resources, for example hosts, subnets, and domains, with at least one organization and location context.
88

99
Organizations and locations enable you to arrange {Project} resources into logically structured groups.
10-
For example, you can create groups based on ownership, purpose, content, or security level.
10+
For example, you can create groups based on ownership, purpose,
11+
ifdef::katello,orcharhino,satellite[]
12+
content,
13+
endif::[]
14+
or security level.
1115
ifdef::satellite[]
1216
You can create and manage multiple organizations through {ProjectName}, then divide and assign your Red{nbsp}Hat subscriptions to each individual organization.
1317
endif::[]
14-
ifndef::satellite[]
18+
ifndef::foreman-deb,foreman-el,satellite[]
1519
You can create and manage multiple organizations through {ProjectName}, then divide and assign subscriptions to each individual organization.
1620
endif::[]
1721

@@ -20,7 +24,7 @@ Organizations can represent different business units, departments, or teams, suc
2024
ifdef::satellite[]
2125
Each organization requires a separate Red{nbsp}Hat subscription manifest.
2226
endif::[]
23-
ifndef::satellite[]
27+
ifndef::foreman-deb,foreman-el,satellite[]
2428
To manage Red{nbsp}Hat content, each organization requires a separate Red{nbsp}Hat subscription manifest.
2529
endif::[]
2630
+
@@ -39,9 +43,17 @@ Unlike organizations, locations can have a hierarchical structure.
3943
Resources and users can generally only access resources within their own context, which makes configuring organizations and locations an integral part of access management in {Project}.
4044

4145
{ProjectServer} defines all locations and organizations.
42-
Each {SmartProxyServer} synchronizes content and handles configuration of hosts in a different location.
46+
Each {SmartProxyServer}
47+
ifdef::katello,orcharhino,satellite[]
48+
synchronizes content and
49+
endif::[]
50+
handles configuration of hosts in a different location.
4351

44-
Your {ProjectServer} retains the management function, while the content and configuration is synchronized between your {ProjectServer} and {SmartProxyServers} assigned to certain locations.
52+
Your {ProjectServer} retains the management function, while the
53+
ifdef::katello,orcharhino,satellite[]
54+
content and
55+
endif::[]
56+
configuration is synchronized between your {ProjectServer} and {SmartProxyServers} assigned to certain locations.
4557

4658
[IMPORTANT]
4759
====

guides/common/modules/con_projectserver-overview.adoc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,27 @@
33
[id="{ProjectServerID}-Overview_{context}"]
44
= {ProjectServer} overview
55

6-
{ProjectServer} is the central component of a {Project} deployment where you plan and manage the content lifecycle.
6+
{ProjectServer} is the central component of a {Project} deployment.
77

88
A typical {Project} deployment includes one {ProjectServer} on which you perform the following operations:
99

10+
ifdef::katello,orcharhino,satellite[]
1011
* Content lifecycle management
12+
endif::[]
1113
* Configuration of {SmartProxyServers}
1214
* Configuration of hosts
1315
* Host provisioning
16+
ifdef::katello,orcharhino,satellite[]
1417
* Patch management
1518
* Subscription management
19+
endif::[]
1620

21+
ifdef::foreman-deb,foreman-el[]
22+
{ProjectServer} delegates host provisioning and communication to {SmartProxyServers}.
23+
endif::[]
24+
ifdef::katello,orcharhino,satellite[]
1725
{ProjectServer} delegates content distribution, host provisioning, and communication to {SmartProxyServers}.
26+
endif::[]
1827
{ProjectServer} itself also includes a {SmartProxy}.
1928

2029
{ProjectServer} also contains a fine-grained authentication system.

0 commit comments

Comments
 (0)