Include information about N-2 Smart Proxy support (#3573)

Co-authored-by: Akshay Gadhave <[email protected]>
theforeman · Jan 28, 2025 · cbcc566 · cbcc566
1 parent 4a4e4ff
commit cbcc566
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/guides/common/attributes-orcharhino.adoc b/guides/common/attributes-orcharhino.adoc
@@ -3,6 +3,7 @@
 :BaseURL: https://docs.orcharhino.com/
 :ProjectVersion: 7.0
 :ProjectVersionPrevious: 6.11
+:ProjectVersionPrevious-Previous: 6.10
 :Project: orcharhino
 :project-allcaps: ORCHARHINO
 :project-context: {Project}

diff --git a/guides/common/attributes-satellite.adoc b/guides/common/attributes-satellite.adoc
@@ -2,6 +2,7 @@
 :install-on-os: RHEL
 :ProjectVersion: 6.17
 :ProjectVersionPrevious: 6.16
+:ProjectVersionPrevious-Previous: 6.15
 // Add -beta for Beta releases
 :ProjectVersionRepoTitle: {ProjectVersion}
 

diff --git a/guides/common/attributes.adoc b/guides/common/attributes.adoc
@@ -5,6 +5,7 @@
 // Version numbers
 :ProjectVersion: nightly
 :ProjectVersionPrevious: 3.13
+:ProjectVersionPrevious-Previous: 3.12
 :KatelloVersion: nightly
 :PulpcoreVersion: 3.63
 :CandlepinVersion: 4.4

diff --git a/guides/common/modules/con_upgrade-paths.adoc b/guides/common/modules/con_upgrade-paths.adoc
@@ -27,7 +27,12 @@ ifdef::foreman-deb[]
 . Upgrade all {SmartProxyServers} to {ProjectVersion}.
 endif::[]
 
+ifdef::orcharhino[]
 {SmartProxies} at version {ProjectVersionPrevious} will keep working with your upgraded {ProjectServer} {ProjectVersion}.
+endif::[]
+ifndef::orcharhino[]
+{SmartProxies} at version {ProjectVersionPrevious} and {ProjectVersionPrevious-Previous} will keep working with your upgraded {ProjectServer} {ProjectVersion}.
+endif::[]
 After you upgrade {ProjectServer} to {ProjectVersion}, you can upgrade your {SmartProxies} separately over multiple maintenance windows.
 ifdef::foreman-el,katello,satellite[]
 For more information, see xref:Upgrading_Proxies_Separately_from_Server_{context}[].

diff --git a/guides/common/modules/con_upgrading-smartproxies-separately-from-project.adoc b/guides/common/modules/con_upgrading-smartproxies-separately-from-project.adoc
@@ -1,9 +1,17 @@
 [id="Upgrading_Proxies_Separately_from_Server_{context}"]
 = Upgrading {SmartProxies} separately from {Project}
 
+ifdef::orcharhino[]
 You can upgrade {Project} to version {ProjectVersion} and keep {SmartProxies} at version {ProjectVersionPrevious} until you have the capacity to upgrade them too.
 
 All the functionality that worked previously works on {ProjectVersionPrevious} {SmartProxies}.
+endif::[]
+ifndef::orcharhino[]
+You can upgrade {Project} to version {ProjectVersion} and keep {SmartProxies} at version {ProjectVersionPrevious} or {ProjectVersionPrevious-Previous} until you have the capacity to upgrade them too.
+
+All the functionality that worked previously works on {ProjectVersionPrevious-Previous} and {ProjectVersionPrevious} {SmartProxies}.
+endif::[]
+
 However, the functionality added in the {ProjectVersion} release will not work until you upgrade {SmartProxies} to {ProjectVersion}.
 
 Upgrading {SmartProxies} after upgrading {Project} can be useful in the following example scenarios:

diff --git a/guides/common/modules/snip_prerequisites-upgrading-project-server.adoc b/guides/common/modules/snip_prerequisites-upgrading-project-server.adoc
@@ -24,7 +24,12 @@ endif::[]
 ifdef::katello,orcharhino,satellite[]
 * If you use content views to control updates to the base operating system of {SmartProxyServer}, or for {SmartProxyServer} repository, you must publish updated versions of those content views.
 endif::[]
+ifdef::orcharhino[]
 * Note that {ProjectServer} upgraded from {ProjectVersionPrevious} to {ProjectVersion} can use {SmartProxyServers} still at {ProjectVersionPrevious}.
+endif::[]
+ifndef::orcharhino[]
+* Note that {ProjectServer} upgraded from {ProjectVersionPrevious} to {ProjectVersion} can use {SmartProxyServers} still at {ProjectVersionPrevious-Previous} and {ProjectVersionPrevious}.
+endif::[]
 
 ifdef::katello,orcharhino,satellite[]
 [WARNING]