diff --git a/data/defaults.yaml b/data/defaults.yaml --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -1858,17 +1858,17 @@ task_queues: - swh.loader.package.cran.tasks.LoadCRAN -swh::deploy::worker::loader_functional::config_file: "%{hiera('swh::conf_directory')}/loader_functional.yml" -swh::deploy::worker::loader_functional::private_tmp: true -swh::deploy::worker::loader_functional::concurrency: 1 -swh::deploy::worker::loader_functional::loglevel: info -swh::deploy::worker::loader_functional::config: +swh::deploy::worker::loader_nixguix::config_file: "%{hiera('swh::conf_directory')}/loader_nixguix.yml" +swh::deploy::worker::loader_nixguix::private_tmp: true +swh::deploy::worker::loader_nixguix::concurrency: 1 +swh::deploy::worker::loader_nixguix::loglevel: info +swh::deploy::worker::loader_nixguix::config: storage: "%{alias('swh::deploy::worker::storage::pipeline')}" max_content_size: 104857600 celery: task_broker: "%{alias('swh::deploy::worker::task_broker')}" task_queues: - - swh.loader.package.functional.tasks.LoadFunctional + - swh.loader.package.nixguix.tasks.LoadNixGuix swh::deploy::lister::db::local: cls: local diff --git a/data/location/sesi_rocquencourt_staging.yaml b/data/location/sesi_rocquencourt_staging.yaml --- a/data/location/sesi_rocquencourt_staging.yaml +++ b/data/location/sesi_rocquencourt_staging.yaml @@ -55,7 +55,7 @@ - loader_cran - loader_debian - loader_deposit - - loader_functional + - loader_nixguix - loader_git - loader_npm - loader_pypi diff --git a/site-modules/profile/manifests/swh/deploy/worker/loader_functional.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_functional.pp deleted file mode 100644 --- a/site-modules/profile/manifests/swh/deploy/worker/loader_functional.pp +++ /dev/null @@ -1,12 +0,0 @@ -# Deployment for loader-functional -class profile::swh::deploy::worker::loader_functional { - include ::profile::swh::deploy::worker::base_loader_archive - - $private_tmp = lookup('swh::deploy::worker::loader_functional::private_tmp') - - ::profile::swh::deploy::worker::instance {'loader_functional': - ensure => present, - private_tmp => $private_tmp, - sentry_name => 'loader_core', - } -} diff --git a/site-modules/profile/manifests/swh/deploy/worker/loader_nixguix.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_nixguix.pp new file mode 100644 --- /dev/null +++ b/site-modules/profile/manifests/swh/deploy/worker/loader_nixguix.pp @@ -0,0 +1,12 @@ +# Deployment for loader-nixguix +class profile::swh::deploy::worker::loader_nixguix { + include ::profile::swh::deploy::worker::base_loader_archive + + $private_tmp = lookup('swh::deploy::worker::loader_nixguix::private_tmp') + + ::profile::swh::deploy::worker::instance {'loader_nixguix': + ensure => present, + private_tmp => $private_tmp, + sentry_name => 'loader_core', + } +}