Differential D3963
data/defaults: Drop global.ini file Authored by ardumont on Sep 16 2020, 12:45 PM.
Details
This should allow dropping "dead code" in swh.core.config module regarding ini [1] https://forge.softwareheritage.org/source/swh-core/browse/master/swh/core/config.py$96-104 Related to T1532 octocatalog bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging uffizi
Found host uffizi.softwareheritage.org
Cloning into '/tmp/swh-ocd.WIAYt237/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.WIAYt237/environments/staging/data/private'...
done.
*** Running octocatalog-diff on host uffizi.softwareheritage.org
I, [2020-09-16T14:27:38.255079 #24752] INFO -- : Catalogs compiled for uffizi.softwareheritage.org
I, [2020-09-16T14:27:39.467942 #24752] INFO -- : Diffs computed for uffizi.softwareheritage.org
diff origin/production/uffizi.softwareheritage.org current/uffizi.softwareheritage.org
*******************************************
File[/etc/softwareheritage/global.ini] =>
parameters =>
ensure =>
- file
+ absent
*******************************************
*** End octocatalog-diff on uffizi.softwareheritage.org
Diff Detail
Event TimelineComment Actions I agree with the switch to yaml, but I don't think we should have plain text yaml files in the hiera variables. We should switch the swh::global_conf hiera variable to be a yaml dict, and the way the file is generated by the profile::swh to inline this yaml (with a "warning" header). Or we could drop the file altogether, as it's not being used at all now. Comment Actions We should also make profile::swh remove the old file, because it will still be loaded if it exists, even if it's not referenced in puppet. Comment Actions
yes, thanks for confirming this.
...properly indeed ;) I intend to follow up on the code cleanup after that. Comment Actions Drop variable in the end Note: don't worry about the commits, i'll squash them. Comment Actions Update diffs with the 2 commits i'm talking about (i think i messed up the prior update) Comment Actions Bye bye .ini. log_db should also be removed from the swh.core.config default config. the PostgreSQL logger has been removed a long time ago but it seems this has been missed. Comment Actions squash and rework commit message fwiw, i've checked on staging that loaders are still properly starting without |