Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include information about N-2 Smart Proxy support #3573

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Include information about N-2 Smart Proxy support #3573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d48dc8
Include information about N-2 Smart Proxy support
Jan 16, 2025
04d5ba2
Include attribute values for Orcharhino and Foreman builds
Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions guides/common/attributes-orcharhino.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions guides/common/attributes-satellite.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
1 change: 1 addition & 0 deletions guides/common/attributes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Version numbers
:ProjectVersion: nightly
:ProjectVersionPrevious: 3.13
:ProjectVersionPrevious-Previous: 3.12
:KatelloVersion: nightly
:PulpcoreVersion: 3.63
:CandlepinVersion: 4.4
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/con_upgrade-paths.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}[].
Expand Down
4 changes: 2 additions & 2 deletions guides/common/modules/con_upgrading-smartproxies-separately-from-project.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/snip_prerequisites-upgrading-project-server.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading