Skip to content

Commit c8fb643

Browse files
Make multiple CV environments fit for all builds (theforeman#3806)
* Fix broken links * Make example activation key italic * Use ProjectWebUI attribute * Use attributes for example content * Use foreman-example-com macro in favor of hardcoded FQDN * Use sentence-case capitalization * Write Hammer CLI in favor of Hammer Refs PR 3609 on GitHub
1 parent 0f7e6b6 commit c8fb643

6 files changed

+32
-20
lines changed

guides/common/assembly_managing-content-view-environments.adoc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,20 @@ include::modules/con_content-view-environments-overview.adoc[leveloffset=+1]
44

55
include::modules/con_content-view-environment-categories.adoc[leveloffset=+1]
66

7+
ifdef::satellite[]
8+
:example-repo-id: satellite-client-6-for-rhel-9-x86_64-rpms
9+
:example-repo-name: Red Hat Satellite Client 6 for RHEL 9 x86_64 (RPMs)
10+
:example-repo-url: https://{foreman-example-com}/pulp/content/_My_Organization_/Library/cv1/content/dist/layered/rhel9/x86_64/_My_Product_/_My_Repository_ID_/os
11+
endif::[]
12+
ifndef::satellite[]
13+
:example-repo-id: {project-context}-client
14+
:example-repo-name: {Project} Client
15+
:example-repo-url: https://{foreman-example-com}/pulp/content/_My_Organization_/Library/cv1/content/dist/layered/{project-context}-client/x86_64/_My_Product_/_My_Repository_ID_/os
16+
endif::[]
717
include::modules/con_content-view-environment-ordering-and-priority.adoc[leveloffset=+1]
18+
:!example-repo-id:
19+
:!example-repo-name:
20+
:!example-repo-url:
821

922
include::modules/proc_assigning-content-view-environments-to-hosts.adoc[leveloffset=+1]
1023

guides/common/modules/con_comparison-of-content-view-environments-and-composite-content-views.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ Composite content views provide an alternative method for granting hosts access
55
You can use composite content views, multiple content view environments, or a combination of both.
66
The key differences between these methods include the following:
77

8-
Access Timing::
8+
Access timing::
99
Hosts assigned to composite content views gain access to the combined content only after you publish the composite content view.
1010
Hosts assigned to multiple content view environments immediately access the combined content from all assigned environments.
1111

12-
Conflict Resolution::
12+
Conflict resolution::
1313
Composite content views resolve conflicts at the time of publishing by merging duplicate repositories.
1414
For hosts assigned to multiple content view environments, repository conflicts are resolved based on the order of content view environments.
1515
For more information about content view environment ordering and priority, see xref:content-view-environment-ordering-and-priority[].
1616

17-
Version Selection::
17+
Version selection::
1818
Composite content views allow you to select specific versions of a content view, including older versions.
1919
With multiple content view environments, the host always receives the latest version of the content view with no option to select a different version.
2020

21-
Choose the approach that best suits your requirements based on these differences.
21+
Choose the approach that best suits your requirements based on these differences.

guides/common/modules/con_content-view-environment-ordering-and-priority.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $ hammer host update \
2020
--name "{server-example-com}" \
2121
--organization-id _My_Organization_ID_
2222
----
23-
Both content view environments include the `satellite-client-6-for-rhel-9-x86_64-rpms` repository.
23+
Both content view environments include the `{example-repo-id}` repository.
2424
Log in as a `root` user, then run `subscription-manager repos` to inspect the available repositories on the host.
2525
The output reflects the `Library/cv1` content view environment:
2626
[options="nowrap" subs="+quotes"]
@@ -34,9 +34,9 @@ This results in the following output:
3434
+----------------------------------------------------------+
3535
Available Repositories in /etc/yum.repos.d/redhat.repo
3636
+----------------------------------------------------------+
37-
Repo ID: satellite-client-6-for-rhel-9-x86_64-rpms
38-
Repo Name: Red Hat Satellite Client 6 for RHEL 9 x86_64 (RPMs)
39-
Repo URL: https://centos9-katello-devel-stable.example.com/pulp/content/Default_Organization/Library/cv1/content/dist/layered/rhel9/x86_64/sat-client/6/os
37+
Repo ID: {example-repo-id}
38+
Repo Name: {example-repo-name}
39+
Repo URL: {example-repo-url}
4040
Enabled: 0
4141
----
4242
[NOTE]
@@ -66,9 +66,9 @@ This results in the following output:
6666
+----------------------------------------------------------+
6767
Available Repositories in /etc/yum.repos.d/redhat.repo
6868
+----------------------------------------------------------+
69-
Repo ID: satellite-client-6-for-rhel-9-x86_64-rpms
70-
Repo Name: Red Hat Satellite Client 6 for RHEL 9 x86_64 (RPMs)
71-
Repo URL: https://centos9-katello-devel-stable.example.com/pulp/content/Default_Organization/dev/cv1/content/dist/layered/rhel9/x86_64/sat-client/6/os
69+
Repo ID: {example-repo-id}
70+
Repo Name: {example-repo-name}
71+
Repo URL: {example-repo-url}
7272
Enabled: 0
7373
----
74-
The `Repo URL` now reflects the `dev/cv1` content view environment, meaning the system uses content from `dev/cv1` and ignores `Library/cv1`.
74+
The `Repo URL` now reflects the `dev/cv1` content view environment, meaning the system uses content from `dev/cv1` and ignores `Library/cv1`.

guides/common/modules/con_content-view-environments-overview.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
The *Allow multiple content views* setting controls whether hosts and activation keys can be assigned to multiple content view environments.
55
By default, this feature is disabled, limiting assignments to a single content view environment.
66
Enable this setting to assign multiple content view environments to hosts and activation keys.
7-
For more information on content settings, see {AdministeringDocURL}content_settings_{context}[Content settings] in _{AdministeringDocTitle}_.
7+
For more information on content settings, see {AdministeringDocURL}content_settings_admin[Content settings] in _{AdministeringDocTitle}_.
88

99
Hosts registered with multiple activation keys handle content view environment assignments based on the key order and settings configuration.
1010
For more information about content view environment ordering and priority, see xref:content-view-environment-ordering-and-priority[].
1111

1212
When you disable *Allow multiple content views*, multi-environment hosts remain assigned to multiple content view environments and retain access to all their content.
13-
Existing multi-environment activation keys remain associated with multiple content view environments, and both multi-environment hosts and activation keys remain visible in the web UI and accessible through the Hammer CLI.
13+
Existing multi-environment activation keys remain associated with multiple content view environments, and both multi-environment hosts and activation keys remain visible in the {ProjectWebUI} and accessible through the Hammer CLI.
1414
However, registration fails if you attempt to assign a host to multiple content view environments or use a multi-environment activation key during host registration.
1515
Assigning multiple content view environments to a host or activation key results in an error.
1616

1717
When you disable *Allow multiple content views*, you can still reassign a multi-environment host to a single content view environment.
1818
You can also reassign a multi-environment activation key to a single content view environment or remove all content view environments from the key.
1919

20-
This setting provides flexibility in managing how content view environments are applied to hosts and activation keys while ensuring consistent behavior when disabled.
20+
This setting provides flexibility in managing how content view environments are applied to hosts and activation keys while ensuring consistent behavior when disabled.

guides/common/modules/proc_assigning-content-view-environments-to-activation-keys.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ For more information, see xref:content-view-environment-ordering-and-priority[].
88
[NOTE]
99
====
1010
You cannot reassign a multi-environment activation key's content view environments using the {ProjectWebUI}.
11-
To change content view environments, update the activation key with Hammer.
11+
To change content view environments, update the activation key with Hammer CLI.
1212
====
1313

1414
.Prerequisites
1515
* The *Allow multiple content views* setting must be enabled.
16-
For more information on content settings, see {AdministeringDocURL}content_settings_{context}[Content settings] in _{AdministeringDocTitle}_.
16+
For more information on content settings, see {AdministeringDocURL}content_settings_admin[Content settings] in _{AdministeringDocTitle}_.
1717

1818
.CLI procedure
1919
. Display the available content view environments to obtain their labels or IDs:
@@ -22,7 +22,6 @@ For more information on content settings, see {AdministeringDocURL}content_setti
2222
----
2323
$ hammer content-view-environment list
2424
----
25-
+
2625
. Assign content view environments to an activation key:
2726
* By using their labels:
2827
+
@@ -41,4 +40,4 @@ $ hammer activation-key update \
4140
--id _My_Activation_Key_ID_ \
4241
--organization-id _My_Organization_ID_ \
4342
--content-view-environment-ids [_My_content_view_env_ID_1_, _My_content_view_env_ID_2_]
44-
----
43+
----

guides/common/modules/proc_removing-all-content-view-environments-from-an-activation-key.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ $ hammer activation-key update \
1919
----
2020
$ hammer activation-key update \
2121
--content-view-environments "" \
22-
--name My_Activation_Key \
22+
--name _My_Activation_Key_ \
2323
--organization-id _My_Organization_ID_
2424
----

0 commit comments

Comments
 (0)