From 0d48dc8f3f7da9455a9749e9f59ae721910eb7e0 Mon Sep 17 00:00:00 2001 From: Akshay Gadhave Date: Thu, 16 Jan 2025 12:42:48 +0530 Subject: [PATCH 1/2] Include information about N-2 Smart Proxy support Project now supports Smart Proxies of verions N-1 and N-2. Added a new attribute for N-2 Smart Proxy : {ProjectVersionPrevious-Previous}. Added information about N-2 Smart Proxy support for Upgrade guide modules. --- guides/common/attributes-satellite.adoc | 1 + guides/common/modules/con_upgrade-paths.adoc | 2 +- .../con_upgrading-smartproxies-separately-from-project.adoc | 4 ++-- .../modules/snip_prerequisites-upgrading-project-server.adoc | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/guides/common/attributes-satellite.adoc b/guides/common/attributes-satellite.adoc index 262dc130d27..d7ce3922645 100644 --- 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/modules/con_upgrade-paths.adoc b/guides/common/modules/con_upgrade-paths.adoc index 45f4aaeb0db..2369f4a3d37 100644 --- a/guides/common/modules/con_upgrade-paths.adoc +++ b/guides/common/modules/con_upgrade-paths.adoc @@ -27,7 +27,7 @@ ifdef::foreman-deb[] . Upgrade all {SmartProxyServers} to {ProjectVersion}. endif::[] -{SmartProxies} at version {ProjectVersionPrevious} will keep working with your upgraded {ProjectServer} {ProjectVersion}. +{SmartProxies} at version {ProjectVersionPrevious} and {ProjectVersionPrevious-Previous} will keep working with your upgraded {ProjectServer} {ProjectVersion}. 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 index eadacfd46f6..8d756093a12 100644 --- 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,9 @@ [id="Upgrading_Proxies_Separately_from_Server_{context}"] = Upgrading {SmartProxies} separately from {Project} -You can upgrade {Project} to version {ProjectVersion} and keep {SmartProxies} at version {ProjectVersionPrevious} until you have the capacity to upgrade them too. +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} {SmartProxies}. +All the functionality that worked previously works on {ProjectVersionPrevious-Previous} and {ProjectVersionPrevious} {SmartProxies}. 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 index 402218691f1..5accf9b8190 100644 --- a/guides/common/modules/snip_prerequisites-upgrading-project-server.adoc +++ b/guides/common/modules/snip_prerequisites-upgrading-project-server.adoc @@ -24,7 +24,7 @@ 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::[] -* Note that {ProjectServer} upgraded from {ProjectVersionPrevious} to {ProjectVersion} can use {SmartProxyServers} still at {ProjectVersionPrevious}. +* Note that {ProjectServer} upgraded from {ProjectVersionPrevious} to {ProjectVersion} can use {SmartProxyServers} still at {ProjectVersionPrevious-Previous} and {ProjectVersionPrevious}. ifdef::katello,orcharhino,satellite[] [WARNING] From 04d5ba2c00b2e6ee4baa8548b4441ff5f9860967 Mon Sep 17 00:00:00 2001 From: Akshay Gadhave Date: Fri, 17 Jan 2025 11:48:08 +0530 Subject: [PATCH 2/2] Include attribute values for Orcharhino and Foreman builds --- guides/common/attributes-orcharhino.adoc | 1 + guides/common/attributes.adoc | 1 + 2 files changed, 2 insertions(+) diff --git a/guides/common/attributes-orcharhino.adoc b/guides/common/attributes-orcharhino.adoc index f76c5c9cab6..dda331502a5 100644 --- 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.adoc b/guides/common/attributes.adoc index 87f18404561..f9b335b7981 100644 --- 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