diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -2328,20 +2328,6 @@ port: 9200 swh::deploy::scheduler::archive::conf_file: "%{lookup('swh::deploy::scheduler::conf_dir')}/elastic.yml" -swh::deploy::scheduler::archive::user: "%{hiera('swh::deploy::scheduler::user')}" -swh::deploy::scheduler::archive::config: - scheduler: "%{alias('swh::remote_service::scheduler::config::writable')}" - elasticsearch: - cls: local - args: - index_name_prefix: swh-tasks - storage_nodes: - "%{alias('swh::elasticsearch::storage_nodes')}" - client_options: - sniff_on_start: false - sniff_on_connection_fail: true - http_compress: false - sniffer_timeout: 60 swh::deploy::scheduler::journal_client::config_file: "%{lookup('swh::deploy::scheduler::conf_dir')}/journal-client.yml" swh::deploy::scheduler::journal_client::user: "%{alias('swh::deploy::scheduler::user')}" diff --git a/site-modules/profile/manifests/swh/deploy/scheduler.pp b/site-modules/profile/manifests/swh/deploy/scheduler.pp --- a/site-modules/profile/manifests/swh/deploy/scheduler.pp +++ b/site-modules/profile/manifests/swh/deploy/scheduler.pp @@ -64,31 +64,12 @@ # task archival cron $archive_config_file = lookup('swh::deploy::scheduler::archive::conf_file') - $archive_config = lookup('swh::deploy::scheduler::archive::config') file {$archive_config_file: - ensure => present, + ensure => absent, owner => 'root', group => $group, mode => '0640', - content => inline_template("<%= @archive_config.to_yaml %>\n"), - require => File[$config_dir], } - cron {'archive_completed_oneshot_and_disabled_recurring_tasks': - ensure => absent, - user => $user, - } - - profile::cron::d {'scheduler_archive_tasks': - user => $user, - command => "/usr/bin/swh scheduler --config-file ${archive_config_file} task archive", - monthday => '1', - hour => '0', - minute => '0', - require => [ - Package[$packages], - File[$archive_config_file], - ], - } }