partial Satellite 6.10 support #397

evgeni · 2021-09-15T08:43:40Z

This change introduces partial Satellite 6.10 support.
It's partial because the following features weren't updated yet:

disassociation of external capsules
pulp data reset

The later needs a different reset mechanism due to architectural changes in
pulp3. Probably something like this, instead of all the mongodb stuff, will
work:

drop pulpcore db
create pulpcore db
migrate pulpcore db

evgeni · 2021-09-15T08:44:21Z

I intentionally didn't add it to the README.md yet, as it's incomplete.

ekohl

Pulp Node usage also needs fixing since that's Pulp 2: https://github.com/RedHatSatellite/satellite-clone/search?q=pulp+node

wbclark · 2021-09-15T19:23:23Z

Thanks @evgeni . Would you consider getting #392 in first (and if so, should this be rebased?)

wbclark · 2021-09-15T19:25:52Z

roles/satellite-clone/files/disassociate_capsules.rb

 external_capsules = []
-external_capsule_ids = get_info_from_hammer("--csv capsule list --search 'feature = \"Pulp Node\"'")
+external_capsule_ids = get_info_from_hammer("--csv capsule list --search '(feature = \"Pulp Node\" or feature = \"Pulpcore\") and name != \"#{internal_capsule}\"'")


Suggested change

external_capsule_ids = get_info_from_hammer("--csv capsule list --search '(feature = \"Pulp Node\" or feature = \"Pulpcore\") and name != \"#{internal_capsule}\"'")

external_capsule_ids = get_info_from_hammer("--csv capsule list --search '(name != \"#{internal_capsule}\"'")

I think this is simpler and works just as well; downstream does not support disabling Pulp on Capsules

That's probably true.

One thing that bothers me: you can update the name of a capsule, and nothing will break… or should, with the code change here, it will :D

We could do url !~ https://#{internal_capsule} instead, but that also doesn't feel right

I would prefer not to build that in. The whole concept of a Smart Proxy on the same host is IMHO a Katelloism I'd love to kill. As we're looking at other architectures, we may at some point support a satellite.example.com without a Capsule and then a content.example.com which is your primary Capsule. If you start relying only on hostnames it becomes even more obscure that you really do want Smart Proxies that have content.

I think this is simpler and works just as well; downstream does not support disabling Pulp on Capsules

It's not supported today, but your suggestion makes it harder to support it tomorrow.

We should really file an RFE for Hammer to expose the capability. The API does.

wbclark · 2021-09-15T19:28:14Z

roles/satellite-clone/files/disassociate_capsules.rb

@@ -24,8 +24,11 @@ def capsule_lce_args(action, capsule_id, env)
  "--csv capsule content #{action}-lifecycle-environment --id #{capsule_id} --lifecycle-environment-id #{env}"
 end

+# the correct way is to look at hosts with the Pulpcore feature and the mirror capability
+# but hammer doesn't support that
+internal_capsule = ARGV[0]


I was thinking this might be internal_capsule = Socket.gethostname since the hostname change has already been performed when this script is run.

But your approach of relying on the ansible variable value seems very nice and consistent. 👍

I have bad experience with Python's socket.getfqdn(), so I'll pass ;)

evgeni · 2021-09-15T19:59:09Z

Thanks @evgeni . Would you consider getting #392 in first (and if so, should this be rebased?)

Yeah, sounds good.

evgeni · 2021-10-01T05:46:39Z

I've dropped the capsule part from this PR, making it strictly Satellite only. This makes it:

not conflict with Bug fixes and style improvements to Capsule LCE disassociation script #392, so we can merge them independently
easier for us to go and get a proper solution for the capsule problem

evgeni · 2021-10-01T05:47:56Z

cc @mccun934 @sthirugn

ekohl

How do we deal with that this is only partial support? Do we document this somehow?

evgeni · 2021-10-01T13:47:58Z

I'd just not document 6.10 being supported at all (in the readme) yet

ekohl · 2021-10-01T14:26:18Z

The line SUPPORTED_VERSIONS could be a bit confusing. Perhaps the PR title should also reflect that it's partial?

ehelms

Per previous suggestion, modify the commit message to indicate this adds initial server only support for Satellite 6.10?

This change introduces partial Satellite 6.10 support. It's partial because the following features weren't updated yet: * disassociation of external capsules * pulp data reset The later needs a different reset mechanism due to architectural changes in pulp3. Probably something like this, instead of all the mongodb stuff, will work: - drop pulpcore db - create pulpcore db - migrate pulpcore db

evgeni · 2021-10-13T14:36:54Z

@ehelms @ekohl updated commit/PR message to reflect the current state of affairs

ekohl · 2021-10-14T09:59:26Z

roles/satellite-clone/tasks/main.yml

@@ -176,7 +176,7 @@
  file:
    path: /var/opt/rh/rh-postgresql12/lib/pgsql/data/postgresql.conf
    state: absent
-  when: satellite_version in ["6.8", "6.9"]
+  when: satellite_version in ["6.8", "6.9", "6.10"]


I still feel that we should make the postgresql.conf path a variable and set it appropriately, but I'd be OK with that in a separate PR.

yeah, I think this is something we'll have to tackle with EL8 support anyways

ekohl reviewed Sep 15, 2021

View reviewed changes

wbclark reviewed Sep 15, 2021

View reviewed changes

evgeni force-pushed the sat610 branch 3 times, most recently from 8522732 to 3977a3a Compare September 20, 2021 10:44

evgeni force-pushed the sat610 branch from 3977a3a to afe4535 Compare October 1, 2021 05:44

evgeni marked this pull request as ready for review October 1, 2021 05:46

evgeni added this to the 6.10 support milestone Oct 1, 2021

evgeni mentioned this pull request Oct 1, 2021

Capsule 6.10 support #401

Merged

ekohl reviewed Oct 1, 2021

View reviewed changes

ehelms approved these changes Oct 11, 2021

View reviewed changes

evgeni force-pushed the sat610 branch from afe4535 to f4fb08c Compare October 13, 2021 14:35

evgeni changed the title ~~Satellite 6.10 support~~ partial Satellite 6.10 support Oct 13, 2021

evgeni force-pushed the sat610 branch from f4fb08c to 0bb940a Compare October 13, 2021 14:36

ehelms approved these changes Oct 13, 2021

View reviewed changes

ekohl approved these changes Oct 14, 2021

View reviewed changes

evgeni merged commit 097719d into RedHatSatellite:master Oct 14, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

partial Satellite 6.10 support #397

partial Satellite 6.10 support #397

evgeni commented Sep 15, 2021 •

edited

evgeni commented Sep 15, 2021

ekohl left a comment

wbclark commented Sep 15, 2021

wbclark Sep 15, 2021

evgeni Sep 20, 2021

evgeni Sep 20, 2021

ekohl Sep 22, 2021

wbclark Sep 15, 2021

evgeni Sep 15, 2021

evgeni commented Sep 15, 2021

evgeni commented Oct 1, 2021

evgeni commented Oct 1, 2021

ekohl left a comment

evgeni commented Oct 1, 2021

ekohl commented Oct 1, 2021

ehelms left a comment

evgeni commented Oct 13, 2021

ekohl Oct 14, 2021

evgeni Oct 14, 2021

	external_capsule_ids = get_info_from_hammer("--csv capsule list --search '(feature = \"Pulp Node\" or feature = \"Pulpcore\") and name != \"#{internal_capsule}\"'")
	external_capsule_ids = get_info_from_hammer("--csv capsule list --search '(name != \"#{internal_capsule}\"'")

partial Satellite 6.10 support #397

partial Satellite 6.10 support #397

Conversation

evgeni commented Sep 15, 2021 • edited

evgeni commented Sep 15, 2021

ekohl left a comment

Choose a reason for hiding this comment

wbclark commented Sep 15, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

evgeni commented Sep 15, 2021

evgeni commented Oct 1, 2021

evgeni commented Oct 1, 2021

ekohl left a comment

Choose a reason for hiding this comment

evgeni commented Oct 1, 2021

ekohl commented Oct 1, 2021

ehelms left a comment

Choose a reason for hiding this comment

evgeni commented Oct 13, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

evgeni commented Sep 15, 2021 •

edited