diff --git a/guides/common/modules/proc_installing-and-configuring-puppet-agent-during-host-registration.adoc b/guides/common/modules/proc_installing-and-configuring-puppet-agent-during-host-registration.adoc index 92375d30be6..e0e310959c1 100644 --- a/guides/common/modules/proc_installing-and-configuring-puppet-agent-during-host-registration.adoc +++ b/guides/common/modules/proc_installing-and-configuring-puppet-agent-during-host-registration.adoc @@ -46,12 +46,7 @@ endif::[] . In the {ProjectWebUI}, navigate to *Configure* > *Global Parameters* to add host parameters globally. Alternatively, you can navigate to *Configure* > *Host Groups* and edit or create a host group to add host parameters only to a host group. . Enable the Puppet agent using a host parameter in global parameters or a host group. -// consolidate with line 54 as soon as Satellite client contains Puppet agent 8 -ifdef::satellite[] -+ -Add a host parameter named `enable-puppet7`, select the *boolean* type, and set the value to `true`. -endif::[] -ifdef::katello,orcharhino[] +ifdef::satellite,katello,orcharhino[] + * To use Puppet 8, add a host parameter named `enable-puppet8`, select the *boolean* type, and set the value to `true`. * To use Puppet 7, add a host parameter named `enable-puppet7`, select the *boolean* type, and set the value to `true`. diff --git a/guides/common/modules/proc_synchronizing-the-new-repositories.adoc b/guides/common/modules/proc_synchronizing-the-new-repositories.adoc index 0efd0754c9f..9563affccd2 100644 --- a/guides/common/modules/proc_synchronizing-the-new-repositories.adoc +++ b/guides/common/modules/proc_synchronizing-the-new-repositories.adoc @@ -10,6 +10,9 @@ You must enable and synchronize the new {ProjectVersion} repositories before you . From the list of results, expand the following repositories and click the *Enable* icon to enable the repositories: + * To upgrade {Project} clients, enable the *{project-client-name}* repositories for all {RHEL} versions that clients use. +ifdef::satellite[] +To upgrade Puppet agent to Puppet agent 8, enable the *{project-client-name}-2* repositories for all {RHEL} versions that clients use. +endif::[] + * If you have {SmartProxyServers}, to upgrade them, enable the following repositories too: + diff --git a/guides/common/modules/ref_supported-puppet-versions-and-system-requirements.adoc b/guides/common/modules/ref_supported-puppet-versions-and-system-requirements.adoc index 774cdd6a584..6f338ba9f1d 100644 --- a/guides/common/modules/ref_supported-puppet-versions-and-system-requirements.adoc +++ b/guides/common/modules/ref_supported-puppet-versions-and-system-requirements.adoc @@ -12,11 +12,9 @@ ifndef::satellite[] endif::[] Ensure that the Puppet modules used to configure your hosts are compatible with your Puppet version. + -ifdef::satellite[] -On hosts, you can use Puppet agent 7. -endif::[] -ifndef::satellite[] On hosts, you can use either Puppet agent 8 or Puppet agent 7. +ifdef::satellite[] +To use Puppet agent 8 on the host, enable the *{project-client-name}-2* repository. endif::[] System Requirements:: diff --git a/guides/common/modules/snip_prerequisite-project-client-repository-ak.adoc b/guides/common/modules/snip_prerequisite-project-client-repository-ak.adoc index 4ba357b9014..2bc56f0c911 100644 --- a/guides/common/modules/snip_prerequisite-project-client-repository-ak.adoc +++ b/guides/common/modules/snip_prerequisite-project-client-repository-ak.adoc @@ -3,6 +3,8 @@ ifdef::foreman-el[] endif::[] ifndef::foreman-el[] * {project-client-name} repository for the operating system version of the host is synchronized on {ProjectServer} and enabled in the activation key you use. +ifdef::satellite[] +{project-client-name}-2 repository for the operating system version of the host is synchronized on {ProjectServer} and enabled in the activation key you use, if you want to use Puppet agent 8 on the host. ifndef::orcharhino[] For more information, see {ContentManagementDocURL}Importing_Content_content-management[Importing Content] in _{ContentManagementDocTitle}_. endif::[]