Simplify enable and sync the Client repo for Satellite (theforeman#3133)

apinnick · Jul 20, 2024 · 620b1bd · 620b1bd
1 parent b8d592d
commit 620b1bd
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 216 deletions.
diff --git a/...mon/assembly_enabling-and-synchronizing-the-project-client-name-repository.adoc b/...mon/assembly_enabling-and-synchronizing-the-project-client-name-repository.adoc
diff --git a/guides/common/assembly_importing-the-project-client-name-repository.adoc b/guides/common/assembly_importing-the-project-client-name-repository.adoc
@@ -0,0 +1,5 @@
+include::modules/con_importing-the-project-client-name-repository.adoc[]
+
+include::modules/proc_enabling-the-project-client-name-repository.adoc[leveloffset=+1]
+
+include::modules/proc_synchronizing-the-project-client-name-repository.adoc[leveloffset=+1]
diff --git a/.../modules/con_enabling-and-synchronizing-the-project-client-name-repository.adoc b/.../modules/con_enabling-and-synchronizing-the-project-client-name-repository.adoc
diff --git a/guides/common/modules/con_importing-the-project-client-name-repository.adoc b/guides/common/modules/con_importing-the-project-client-name-repository.adoc
@@ -0,0 +1,24 @@
+[id="importing-the-project-client-name-repository_{context}"]
+= Importing the {project-client-name} repository
+
+The {Team} {project-client-name} repository provides client integration tools, such as `katello-host-tools` or `puppet-agent` packages, for hosts registered to {Project}.
+You must enable the repository, synchronize the repository to your {ProjectServer}, and enable the repository on your hosts.
+
+ifeval::["{mode}" == "disconnected"]
+.Prerequisites
+* Ensure that the {project-client-name} repository is enabled and synchronized from the {Team} CDN on your connected {ProjectServer}.
+For more information, see link:{InstallingServerDocURL}importing-the-project-client-name-repository_satellite[Importing the {project-client-name} repository] in _{InstallingServerDocTitle}_.
+* Your disconnected {ProjectServer} is configured to synchronize content either over the network or by using export.
+
+.Next steps
+* If you use ISS Network Sync, continue with enabling and synchronizing the repository as described below.
+* If you use ISS Export Sync, follow these steps:
+- Export the {project-client-name} repository or your whole Library from your connected {ProjectServer}.
+- Import the {project-client-name} repository or the Library into your disconnected {ProjectServer}.
+
++
+You must synchronize the {project-client-name} repository for every RHEL version you intend to run on your hosts.
+
+.Additional resources
+* link:{ContentManagementDocURL}synchronizing_content_between_servers_content-management[Synchronizing content between {ProjectServer}s] in _{ContentManagementDocTitle}_
+endif::[]
diff --git a/...les/proc_enabling-the-project-client-name-repository-for-rhel-7-and-rhel-6.adoc b/...les/proc_enabling-the-project-client-name-repository-for-rhel-7-and-rhel-6.adoc
diff --git a/...les/proc_enabling-the-project-client-name-repository-for-rhel-9-and-rhel-8.adoc b/...les/proc_enabling-the-project-client-name-repository-for-rhel-9-and-rhel-8.adoc
diff --git a/guides/common/modules/proc_enabling-the-project-client-name-repository.adoc b/guides/common/modules/proc_enabling-the-project-client-name-repository.adoc
@@ -0,0 +1,17 @@
+[id="enabling-the-project-client-name-repository_{context}"]
+= Enabling the {project-client-name} repository
+
+Enable the {Team} {project-client-name} repository for every major version of {RHEL} that you intend to run on your hosts.
+After enabling a Red Hat repository, {Project} creates a Product for this repository automatically.
+
+.Prerequisites
+* Ensure that a subscription manifest has been imported to your organization.
+For more information, see xref:Importing_a_Red_Hat_Subscription_Manifest_into_Server_{context}[].
+
+.Procedure
+. In the {ProjectWebUI}, navigate to *Content* > *Red Hat Repositories*.
+. Ensure that the *RPM* repository type is selected.
+. In the search field, type `name ~ "Satellite Client"` and press *Enter*.
+Optionally, enable the *Recommended Repositories* filter to limit the results.
+. Click the name of the required repository to expand the repository set.
+. For the required architecture, click the *+* icon to enable the repository.
diff --git a/...roc_synchronizing-the-project-client-name-repository-for-rhel-7-and-rhel-6.adoc b/...roc_synchronizing-the-project-client-name-repository-for-rhel-7-and-rhel-6.adoc
diff --git a/...roc_synchronizing-the-project-client-name-repository-for-rhel-9-and-rhel-8.adoc b/...roc_synchronizing-the-project-client-name-repository-for-rhel-9-and-rhel-8.adoc
diff --git a/guides/common/modules/proc_synchronizing-the-project-client-name-repository.adoc b/guides/common/modules/proc_synchronizing-the-project-client-name-repository.adoc
@@ -0,0 +1,17 @@
+[id="synchronizing-the-project-client-name-repository_{context}"]
+= Synchronizing the {project-client-name} repository
+
+Synchronize the {Team} {project-client-name} repository to import the content to your {ProjectServer}.
+
+.Prerequisites
+* You have enabled the {project-client-name} repository.
+
+.Procedure
+. In the {ProjectWebUI}, navigate to *Content* > *Sync Status*.
+. Click the arrow next to the required Product to view available repositories.
+. Select the repositories you want to synchronize.
+. Click *Synchronize Now*.
+
+.Additional resources
+* You can create a sync plan to update the content regularly.
+For more information, see link:{ContentManagementDocURL}Creating_a_Sync_Plan_content-management[Creating a sync plan] in _{ContentManagementDocTitle}_.
diff --git a/guides/doc-Installing_Server/master.adoc b/guides/doc-Installing_Server/master.adoc
@@ -30,7 +30,7 @@ include::common/modules/proc_using-insights-with-satellite-server.adoc[leveloffs
 
 include::common/modules/proc_disabling-registration-to-insights.adoc[leveloffset=+2]
 
-include::common/assembly_enabling-and-synchronizing-the-project-client-name-repository.adoc[leveloffset=+2]
+include::common/assembly_importing-the-project-client-name-repository.adoc[leveloffset=+2]
 
 include::common/modules/proc_configuring-remote-execution-for-pull-client-on-project-server.adoc[leveloffset=+2]
 endif::[]

diff --git a/guides/doc-Installing_Server_Disconnected/master.adoc b/guides/doc-Installing_Server_Disconnected/master.adoc
@@ -32,7 +32,7 @@ include::common/modules/proc_configuring-server-to-sync-content-using-exports.ad
 
 include::common/assembly_importing-kickstart-repositories.adoc[leveloffset=+2]
 
-include::common/assembly_enabling-and-synchronizing-the-project-client-name-repository.adoc[leveloffset=+2]
+include::common/assembly_importing-the-project-client-name-repository.adoc[leveloffset=+2]
 
 include::common/modules/proc_configuring-remote-execution-for-pull-client-on-project-server.adoc[leveloffset=+2]