data/defaults: Drop global.ini file
This should allow dropping "dead code" in swh.core.config module regarding ini file [1]. This is the remaining sole instance of such file.
Related to T1532
Test Plan
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
Migrated from D3963 (view on Phabricator)
Merge request reports
Activity
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 theprofile::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.
! In !226 (closed), @olasd wrote: 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 theprofile::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.
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.Or we could drop the file altogether, as it's not being used at all now.
yes, thanks for confirming this. I'll get rid of it then...
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.
...properly indeed ;)
I intend to follow up on the code cleanup after that.
Some references in the commit message have been migrated:
- T1532 is now swh/devel/swh-core#1532 (closed)
mentioned in merge request swh/devel/swh-core!158 (closed)