Skip to content

Commit bf958bb

Browse files
Fix attribute usage for Client OS (#4176)
* Use client-os attribute for generic Client OS * Bump Client OS example major and minor versions * Use EL in favor for RHEL for Foreman platform * Use EL in favor for RHEL for example EL syncs * Use RHEL in favor of EL for Satellite disconnected * Rephrase registering Foreman server by sub-man to RH * Use RHEL attribute in favor of RHEL * Use sentence-case for link titles * Reword if you use the Katello plugin * Use EL in favor for RHEL for example * Use SLES attribute in favor of SUSE Linux Enterprise Server * Clarify example Client OS for Ansible Playbook * Do not use attribute for RHEL to match Repo IDs * Reword a Enterprise Linux
1 parent 85c20db commit bf958bb

28 files changed

+59
-55
lines changed

guides/common/attributes-base.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@
176176
:client-os-family: Red Hat
177177
:client-os: {EL}
178178
:client-os-context: enterprise-linux
179-
:client-os-major: 8
180-
:client-os-minor: 8
181-
:client-os-minor-bumped: 9
179+
:client-os-major: 9
180+
:client-os-minor: 5
181+
:client-os-minor-bumped: 6
182182
:client-package-install-deb: apt install
183183
:client-package-install-el7: yum install
184184
:client-package-install-el8: dnf install

guides/common/modules/con_aws-requirements.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ifdef::satellite[]
3737
.Red Hat Cloud prerequisites
3838
* Register with Red Hat Cloud Access.
3939
* Migrate any Red Hat subscriptions that you want to use.
40-
* Create an AWS instance and deploy a {RHEL} virtual machine to the instance.
40+
* Create an AWS instance and deploy a virtual machine running {RHEL} to the instance.
4141
For more information about deploying {RHEL} in AWS, see https://access.redhat.com/articles/2962171[How to Locate Red Hat Cloud Access Gold Images on AWS EC2].
4242
* Ensure that your subscriptions are eligible for transfer to Red Hat Cloud.
4343
For more information, see https://www.redhat.com/en/technologies/cloud-computing/cloud-access#program-details[Red Hat Cloud Access Program Details].

guides/common/modules/con_composite-content-views-overview.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The _example_application_ appears as:
2121

2222
Example of four separate content views:
2323

24-
* {RHEL} (Operating System)
24+
* {client-os} (Operating System)
2525
* PostgreSQL (Database)
2626
* MariaDB (Database)
2727
* _example_software_ (Application)
@@ -35,7 +35,7 @@ Example composite content view for a PostgreSQL database:
3535

3636
| _example_software_ (Application)
3737
| PostgreSQL (Database)
38-
| {RHEL} (Operating System)
38+
| {client-os} (Operating System)
3939
|===
4040

4141
Example composite content view for a MariaDB:
@@ -45,7 +45,7 @@ Example composite content view for a MariaDB:
4545

4646
| _example_software_ (Application)
4747
| MariaDB (Database)
48-
| {RHEL} (Operating System)
48+
| {client-os} (Operating System)
4949
|===
5050

5151
Each content view is then managed and published separately.

guides/common/modules/con_content-filter-examples.adoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ For example, if a content view publish task completes in a few minutes without f
1212
====
1313

1414
.Example 1
15-
Create a repository with the base {RHEL} packages.
16-
This filter requires a {RHEL} repository added to the content view.
15+
Create a repository with the base {client-os} packages.
16+
This filter requires a {client-os} repository added to the content view.
1717

1818
*Filter:*
1919

@@ -24,7 +24,7 @@ This filter requires a {RHEL} repository added to the content view.
2424
.Example 2
2525
Create a repository that excludes all errata, except for security updates, after a certain date.
2626
This is useful if you want to perform system updates on a regular basis with the exception of critical security updates, which must be applied immediately.
27-
This filter requires a {RHEL} repository added to the content view.
27+
This filter requires a {client-os} repository added to the content view.
2828

2929
*Filter:*
3030

@@ -55,6 +55,7 @@ Set the *Date Type* to *Updated On*.
5555
Set the *Start Date* to the date you want to restrict errata.
5656
Leave the *End Date* blank to ensure any new non-security errata is filtered.
5757

58+
ifdef::client-content-dnf[]
5859
.Example 4
5960
Filter a specific module stream in a content view.
6061

@@ -71,6 +72,7 @@ Filter a specific module stream in a content view.
7172
* *Filter:* Add a rule to filter any non-modular packages that you want to exclude from the content view.
7273
If you do not filter the packages, the content view filter includes all non-modular packages associated with the module stream *ant*.
7374
Add a rule to exclude all `*` packages, or specify the package names that you want to exclude.
75+
endif::[]
7476

7577
ifndef::orcharhino[]
7678
For another example of how content filters work, see the following article: https://access.redhat.com/solutions/1564953["How do content filters work in Satellite 6"].

guides/common/modules/con_managing-errata.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Red Hat compiles groups of related packages into an *erratum* along with an advi
99
endif::[]
1010
ifndef::satellite[]
1111
{RHEL} users receive errata for each release of official Red Hat RPMs.
12-
SUSE Linux Enterprise Server users receive errata for each release of official SUSE RPMs.
12+
{SLES} users receive errata for each release of official SUSE RPMs.
1313
endif::[]
1414
ifdef::orcharhino[]
1515
Additionally, ATIX provides errata for hosts running Debian, CentOS 7, or Ubuntu.
@@ -31,7 +31,7 @@ ifdef::satellite[]
3131
endif::[]
3232
ifndef::satellite[]
3333
For {RHEL}, {Project} imports errata information when synchronizing repositories with Red Hat's Content Delivery Network (CDN).
34-
For SUSE Linux Enterprise Server, {Project} imports errata information when synchronizing repositories with SUSE Customer Center.
34+
For {SLES}, {Project} imports errata information when synchronizing repositories with SUSE Customer Center.
3535
For AlmaLinux and Rocky Linux, {Project} imports errata information when synchronizing repositories with upstream repositories.
3636
endif::[]
3737
{ProjectName} also provides tools to inspect and filter errata, allowing for precise update management.

guides/common/modules/con_provisioning-cloud-instances-on-microsoft-azure-resource-manager.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ For more information, see https://docs.microsoft.com/en-us/azure/active-director
1919
* Based on your needs, associate a `finish` or `user_data` provisioning template with the operating system you want to use.
2020
For more information about provisioning templates, see {ProvisioningDocURL}provisioning-templates[Provisioning Templates].
2121
* Optional: If you want the virtual machine to use a static private IP address, create a subnet in {Project} with the *Network Address* field matching the Azure subnet address.
22-
* Before creating RHEL BYOS images, you must accept the image terms either in the Azure CLI or Portal so that the image can be used to create and manage virtual machines for your subscription.
22+
* Before creating {RHEL} BYOS images, you must accept the image terms either in the Azure CLI or Portal so that the image can be used to create and manage virtual machines for your subscription.

guides/common/modules/con_resolving-package-dependencies.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ To achieve this, you create filters to exclude most of the errata after the {RHE
5353
Then, you enable dependency solving.
5454
5555
In this situation, dependency solving might include more packages than expected.
56-
As a result, the host diverges from being a {RHEL}{nbsp}8.3 machine.
56+
As a result, the host diverges from {RHEL}{nbsp}8.3 machines.
5757
5858
If you do not need the extra errata and packages, do not configure content view filtering.
5959
Instead, enable and use the {RHEL}{nbsp}8.3 repository on the *Content* > *Red Hat Repositories* page in the {ProjectWebUI}.
@@ -64,7 +64,7 @@ ifeval::["{client-os-family}" == "Red Hat"]
6464
[id="Excluding_packages_and_dependency_solving_with_DNF_{context}"]
6565
.Excluding packages sometimes makes dependency solving impossible for DNF
6666
====
67-
If you make a {RHEL}{nbsp}8.3 repository with a few excluded packages, `dnf upgrade` can sometimes fail.
67+
If you create {RHEL}{nbsp}8.3 repositories with a few excluded packages, `dnf upgrade` can sometimes fail.
6868
6969
Do not enable dependency solving to resolve the problem.
7070
Instead, investigate the error from `dnf` and adjust the filters to stop excluding the missing dependency.

guides/common/modules/proc_applying-errata-to-multiple-hosts.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[id="Applying_Errata_to_Multiple_Hosts_{context}"]
44
= Applying errata to multiple hosts
55

6-
Use these procedures to review and apply errata to multiple RHEL hosts.
6+
Use these procedures to review and apply errata to multiple {client-os} hosts.
77

88
.Prerequisites
99
* Synchronize {ProjectName} repositories with the latest errata available from Red{nbsp}Hat.

guides/common/modules/proc_configuring-a-finish-template-for-amazon-ec2.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ _Template_ _Body_
3333
EOS
3434
----
3535
+
36-
. Click the *Association* tab, and associate the template with a {RHEL} operating system that you want to use.
36+
. Click the *Association* tab, and associate the template with a {client-os} operating system that you want to use.
3737
. Click the *Locations* tab, and add the the location where the host resides.
3838
. Click the *Organizations* tab, and add the organization that the host belongs to.
3939
. Make any additional customizations or changes that you require, then click *Submit* to save your template.

guides/common/modules/proc_configuring-the-freeipa-authentication-source-on-projectserver.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For example, to disable access to the {Project} API and Hammer CLI:
3939
----
4040
# {foreman-installer} --reset-foreman-ipa-authentication-api
4141
----
42-
. If your {ProjectServer} runs in an IPv6-only network and also runs on RHEL{nbsp}9.6 and earlier or RHEL{nbsp}10.0, set the `lookup_family_order` option in the `[domain/_{freeipaserver-example-com}_]` section of the `/etc/sssd/sssd.conf` file:
42+
. If your {ProjectServer} runs in an IPv6-only network and also runs on {EL}{nbsp}9.6 and earlier or {EL}{nbsp}10.0, set the `lookup_family_order` option in the `[domain/_{freeipaserver-example-com}_]` section of the `/etc/sssd/sssd.conf` file:
4343
+
4444
[source, ini, options="nowrap", subs="+quotes,verbatim,attributes"]
4545
----

0 commit comments

Comments
 (0)