diff --git a/dmlite-drop-edg-gridmap-dependency.patch b/dmlite-drop-edg-gridmap-dependency.patch new file mode 100644 index 0000000..454edb9 --- /dev/null +++ b/dmlite-drop-edg-gridmap-dependency.patch @@ -0,0 +1,61 @@ +diff --git a/dist/packaging/rpm/dmlite.spec b/dist/packaging/rpm/dmlite.spec +index 579bdaa6..b76fe67e 100644 +--- a/dist/packaging/rpm/dmlite.spec ++++ b/dist/packaging/rpm/dmlite.spec +@@ -267,7 +267,6 @@ Requires: dmlite-plugins-domeadapter = %{version}-%{release} + Requires: dmlite-dome = %{version}-%{release} + Requires: dmlite-shell = %{version}-%{release} + Requires: dmlite-plugins-mysql = %{version}-%{release} +-Requires: edg-mkgridmap + Requires: fetch-crl + Requires: dmlite-apache-httpd = %{version}-%{release} + Requires: davix >= 0.6.7 +@@ -302,7 +301,6 @@ Requires: dmlite-dpm-dsi = %{version}-%{release} + %endif + Requires: dmlite-plugins-domeadapter = %{version}-%{release} + Requires: dmlite-dome = %{version}-%{release} +-Requires: edg-mkgridmap + Requires: fetch-crl + Requires: dmlite-apache-httpd = %{version}-%{release} + Requires: davix >= 0.6.7 +@@ -335,7 +333,6 @@ Requires: dmlite-plugins-domeadapter = %{version}-%{release} + Requires: dmlite-dome = %{version}-%{release} + Requires: dmlite-shell = %{version}-%{release} + Requires: dmlite-plugins-mysql = %{version}-%{release} +-Requires: edg-mkgridmap + Requires: fetch-crl + Requires: dmlite-apache-httpd = %{version}-%{release} + Requires: davix >= 0.6.7 +@@ -374,7 +371,6 @@ Requires: dmlite-dpm-dsi = %{version}-%{release} + %endif + Requires: dmlite-plugins-domeadapter = %{version}-%{release} + Requires: dmlite-dome = %{version}-%{release} +-Requires: edg-mkgridmap + Requires: fetch-crl + Requires: dmlite-apache-httpd = %{version}-%{release} + +diff --git a/src/puppet/dpm/README.md b/src/puppet/dpm/README.md +index c1f46bbc..8d31f2fa 100644 +--- a/src/puppet/dpm/README.md ++++ b/src/puppet/dpm/README.md +@@ -234,7 +234,7 @@ Be aware that VO that use new IAM VOMS (e.g. LHC VOs) can no longer generate gri + + * **configure_vos** : enable/disable the configuration of the VOs ( default = true) + * **configure_repos** : configure the yum repositories specified in the repos parameter ( default = false) +-* **configure_gridmap** : enable/disable the configuration of gridmap file ( default = true) ++* **configure_gridmap** : enable/disable the configuration of gridmap file ( default = false) + * **gridftp_redirect** : enabled/disabled the GridFTP redirection functionality ( default = true) + * **dpmmgr_user** , **dpmmgr_uid** and **dpmmgr_gid** : the dpm user name , gid and uid ( default = dpmmgr, 151 and 151) + * **debug** : enable/disable debug logs and coredumps for xrootd ( default = false) +diff --git a/src/puppet/dpm/manifests/params.pp b/src/puppet/dpm/manifests/params.pp +index dfb17ef0..6ed1ce9e 100644 +--- a/src/puppet/dpm/manifests/params.pp ++++ b/src/puppet/dpm/manifests/params.pp +@@ -1,6 +1,6 @@ + class dpm::params { + $configure_vos = hiera('dpm::params::configure_vos', true) +- $configure_gridmap = hiera('dpm::params::configure_gridmap', true) ++ $configure_gridmap = hiera('dpm::params::configure_gridmap', false) + $configure_bdii = hiera('dpm::params::configure_bdii', true) + $configure_star = hiera('dpm::params::configure_star', false) + $configure_default_pool = hiera('dpm::params::configure_default_pool',false) diff --git a/dmlite-fix-dcache82-migration.patch b/dmlite-fix-dcache82-migration.patch index a337c9b..befe09b 100644 --- a/dmlite-fix-dcache82-migration.patch +++ b/dmlite-fix-dcache82-migration.patch @@ -32,6 +32,26 @@ diff --git a/shell/src/migrate.py b/shell/src/migrate.py index 412ce0b4..691dd255 100644 --- a/shell/src/migrate.py +++ b/shell/src/migrate.py +@@ -299,7 +299,7 @@ class dpm(object): + try: + ssh = paramiko.SSHClient() + ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) +- ssh.connect(server, username='root', allow_agent=True, look_for_keys=True) ++ ssh.connect(server, port=22, username='root', allow_agent=True, look_for_keys=True) + + channel = ssh.get_transport().open_session() + channel.exec_command("df -B 1 -P {0}".format(fs)) +@@ -707,7 +707,9 @@ class dpm(object): + for spacetoken in sorted(spacetokencfg.keys()): + project, path, groups, space, hostfss = spacetokencfg[spacetoken] + used = spacetokenused.get(spacetoken, 0) +- writer.writerow(['spacetoken', project, spacetoken, path, ','.join(groups), space, used]) ++ if used > space: ++ _log.warn("spacetoken size %i is smaller than used space %i, automatically increased spacetoken size to the used space + 1GB", space, used) ++ writer.writerow(['spacetoken', project, spacetoken, path, ','.join(groups), space if space > used else used + 1024**3, used]) + + for project in sorted(projectcfg.keys()): + spacetokens, space, hostfss = projectcfg[project] @@ -1436,13 +1436,15 @@ class dcache(object): def import_csv(self, nsfile, skip_acl, skip_writetoken): _log.info("import data from %s to dCache database (skip_acl=%s, skip_writetoken=%s)", nsfile, skip_acl, skip_writetoken) diff --git a/dmlite.spec b/dmlite.spec index 7990dd8..28f4676 100644 --- a/dmlite.spec +++ b/dmlite.spec @@ -105,7 +105,7 @@ Name: dmlite Version: 1.15.2 -Release: 14%{?dist}%{?_with_asan:.asan} +Release: 15%{?dist}%{?_with_asan:.asan} Summary: Lcgdm grid data management and storage framework Group: Applications/Internet License: ASL 2.0 @@ -130,6 +130,7 @@ Patch17: dmlite-improve-migration-options.patch Patch18: dmlite-fix-bdii-ldap3-ldif.patch Patch19: dmlite-improve-migration-dcache-config.patch Patch20: dmlite-fix-dcache82-migration.patch +Patch21: dmlite-drop-edg-gridmap-dependency.patch BuildRequires: boost-devel @@ -276,7 +277,6 @@ Requires: dmlite-plugins-domeadapter = %{version}-%{release} Requires: dmlite-dome = %{version}-%{release} Requires: dmlite-shell = %{version}-%{release} Requires: dmlite-plugins-mysql = %{version}-%{release} -Requires: edg-mkgridmap Requires: fetch-crl Requires: dmlite-apache-httpd = %{version}-%{release} Requires: davix >= 0.6.7 @@ -311,7 +311,6 @@ Requires: dmlite-dpm-dsi = %{version}-%{release} %endif Requires: dmlite-plugins-domeadapter = %{version}-%{release} Requires: dmlite-dome = %{version}-%{release} -Requires: edg-mkgridmap Requires: fetch-crl Requires: dmlite-apache-httpd = %{version}-%{release} Requires: davix >= 0.6.7 @@ -344,7 +343,6 @@ Requires: dmlite-plugins-domeadapter = %{version}-%{release} Requires: dmlite-dome = %{version}-%{release} Requires: dmlite-shell = %{version}-%{release} Requires: dmlite-plugins-mysql = %{version}-%{release} -Requires: edg-mkgridmap Requires: fetch-crl Requires: dmlite-apache-httpd = %{version}-%{release} Requires: davix >= 0.6.7 @@ -383,7 +381,6 @@ Requires: dmlite-dpm-dsi = %{version}-%{release} %endif Requires: dmlite-plugins-domeadapter = %{version}-%{release} Requires: dmlite-dome = %{version}-%{release} -Requires: edg-mkgridmap Requires: fetch-crl Requires: dmlite-apache-httpd = %{version}-%{release} @@ -879,6 +876,7 @@ This package provides the modules for the DPM configuration via puppet %patch18 -p1 %patch19 -p1 %patch20 -p1 +%patch21 -p1 %build %global build_flags -DCMAKE_INSTALL_PREFIX=/ -DRUN_ONLY_STANDALONE_TESTS=ON -DOVERWRITE_CONFIGFILES=ON -DINSTALL_PFX_DOC=%{_pkgdocdir} @@ -1096,6 +1094,9 @@ install -p -d -m 755 %{buildroot}%{_localstatedir}/log/dpm-gsiftp %changelog +* Tue May 02 2023 Petr Vokac - 1.15.2-15 +- Drop dependency on legacy and deprecated edg-mkgridmap + * Mon Feb 20 2023 Jonathan Wakely - 1.15.2-14 - Rebuilt for Boost 1.81