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.

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

fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" #3336

Merged
merged 1 commit into from
Feb 17, 2022
Merged

fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" #3336

merged 1 commit into from
Feb 17, 2022

Conversation

huali027
Copy link
Contributor

@huali027 huali027 commented Feb 16, 2022

  • Have you followed the guidelines in our Contributing document, including the instructions about commit messages?
  • Is this PR to correct an issue?
  • Is this PR an enhancement?

* Check the hostname in rhsm.conf too to decide if it's a satellite server
  or capsule when it exists. Sometimes the packages satellite and satellite-capsule are
  installed at the same time, but from the hostname in rhsm.conf, we know it's just
  a capsule server.

Signed-off-by: Huanhuan Li <[email protected]>
@huali027 huali027 changed the title Enhance combiner "SatelliteVersion" and "CapsuleVersion" fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" Feb 16, 2022
@huali027
Copy link
Contributor Author

Fixes #3335.

@huali027
Copy link
Contributor Author

@xiangce Please help to review, thanks.

@xiangce xiangce merged commit d4d7c0a into RedHatInsights:master Feb 17, 2022
psachin pushed a commit that referenced this pull request Feb 17, 2022
* Check the hostname in rhsm.conf too to decide if it's a satellite server
  or capsule when it exists. Sometimes the packages satellite and satellite-capsule are
  installed at the same time, but from the hostname in rhsm.conf, we know it's just
  a capsule server.

Signed-off-by: Huanhuan Li <[email protected]>
(cherry picked from commit d4d7c0a)
xiangce pushed a commit that referenced this pull request Feb 22, 2022
#3342)

* Revert "fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" (#3336)"

This reverts commit d4d7c0a.

Signed-off-by: Huanhuan Li <[email protected]>

* fix: Enhance "CapsuleVersion"

* From some archives, I found "foreman" is installed with "satellite-capsule", but
  it is a true satellite capsule server.

Signed-off-by: Huanhuan Li <[email protected]>
xiangce pushed a commit that referenced this pull request Feb 22, 2022
#3342)

* Revert "fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" (#3336)"

This reverts commit d4d7c0a.

Signed-off-by: Huanhuan Li <[email protected]>

* fix: Enhance "CapsuleVersion"

* From some archives, I found "foreman" is installed with "satellite-capsule", but
  it is a true satellite capsule server.

Signed-off-by: Huanhuan Li <[email protected]>
(cherry picked from commit 3181747)
xiangce pushed a commit that referenced this pull request Sep 6, 2024
* Check the hostname in rhsm.conf too to decide if it's a satellite server
  or capsule when it exists. Sometimes the packages satellite and satellite-capsule are
  installed at the same time, but from the hostname in rhsm.conf, we know it's just
  a capsule server.

Signed-off-by: Huanhuan Li <[email protected]>
xiangce pushed a commit that referenced this pull request Sep 6, 2024
#3342)

* Revert "fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" (#3336)"

This reverts commit 2078701.

Signed-off-by: Huanhuan Li <[email protected]>

* fix: Enhance "CapsuleVersion"

* From some archives, I found "foreman" is installed with "satellite-capsule", but
  it is a true satellite capsule server.

Signed-off-by: Huanhuan Li <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants