properly load inherited foreman settings #419
Conversation
settings
Outdated
| PASS_NAME_GPG="theforeman/releases/foreman/$FOREMAN_VERSION-gpg" | ||
| PASS_NAME_KEY="theforeman/releases/foreman/$FOREMAN_VERSION-key" |
There was a problem hiding this comment.
This overrides the settings, which means you can't override it anymore as we do:
releases/pulpcore/settings
2:PASS_NAME_GPG="theforeman/releases/pulpcore/$VERSION-gpg"
3:PASS_NAME_KEY="theforeman/releases/pulpcore/$VERSION-key"
releases/foreman-debian/settings
1:PASS_NAME_GPG="theforeman/releases/foreman/debian-$VERSION-gpg"
2:PASS_NAME_KEY="theforeman/releases/foreman/debian-$VERSION-key"
releases/candlepin/settings
1:PASS_NAME_GPG="theforeman/releases/candlepin/$VERSION-gpg"
2:PASS_NAME_KEY="theforeman/releases/candlepin/$VERSION-key"It's also not like we can use $PROJECT like this:
| PASS_NAME_GPG="theforeman/releases/foreman/$FOREMAN_VERSION-gpg" | |
| PASS_NAME_KEY="theforeman/releases/foreman/$FOREMAN_VERSION-key" | |
| PASS_NAME_GPG="theforeman/releases/$PROJECT/$VERSION-gpg" | |
| PASS_NAME_KEY="theforeman/releases/$PROJECT/$VERSION-key" |
What I'm leaning to is move these definitions into releases/foreman/settings (and not have any default) but I don't think we load that now when inheriting settings.
Alternatively you can use:
| PASS_NAME_GPG="theforeman/releases/foreman/$FOREMAN_VERSION-gpg" | |
| PASS_NAME_KEY="theforeman/releases/foreman/$FOREMAN_VERSION-key" | |
| PASS_NAME_GPG="${PASS_NAME_GPG:-theforeman/releases/foreman/$FOREMAN_VERSION-gpg}" | |
| PASS_NAME_KEY="${PASS_NAME_KEY:-theforeman/releases/foreman/$FOREMAN_VERSION-key}" |
There was a problem hiding this comment.
dang.
so the problem I was trying to fix is:
When signing Katello, $OSES ends up '' as it first loaded katello/4.14/settings, then foreman/3.12/settings and then overwrote OSES with the value in settings.
To fix that, I moved the "load inherited foreman stuff" logic into load_settings, but that that meant that FOREMAN_VERSION is not yet populated when the old location of PASS_NAME_* was used, so I moved that too.
There was a problem hiding this comment.
I added a commit that I think addresses the concerns. It's not pretty, but I think it'll work.
The values were specific to Foreman, but we have other projects. The code is now modified to ensure the variables are set before they're used. It now also loads the common Foreman settings file for projects that inherit the Foreman settings. Previously it only loaded the version specific settings. Some care is taken in Foreman's common settings to only export values when no inheritance is taking place.
| elif [[ "$FOREMAN_VERSION" != "none" ]]; then | ||
| # load foreman settings, which will contain keys etc | ||
| . releases/foreman/settings | ||
| . "releases/foreman/${FOREMAN_VERSION}/settings" |
There was a problem hiding this comment.
mhh, no, this overwrites OSes that have been set in client/(version/)?settings before. damn.
Fixes: 0ee482d