diff --git a/site-modules/profile/manifests/swh/deploy/base_archiver.pp b/site-modules/profile/manifests/swh/deploy/base_archiver.pp index 3cc2b50e..3dd3a279 100644 --- a/site-modules/profile/manifests/swh/deploy/base_archiver.pp +++ b/site-modules/profile/manifests/swh/deploy/base_archiver.pp @@ -1,12 +1,10 @@ # Archiver base configuration class profile::swh::deploy::base_archiver { - include ::profile::swh::deploy::objstorage_cloud - $packages = ['python3-swh.archiver'] package {$packages: ensure => 'installed', } } diff --git a/site-modules/profile/manifests/swh/deploy/indexer.pp b/site-modules/profile/manifests/swh/deploy/indexer.pp index 4e1966f4..7735ebef 100644 --- a/site-modules/profile/manifests/swh/deploy/indexer.pp +++ b/site-modules/profile/manifests/swh/deploy/indexer.pp @@ -1,5 +1,4 @@ # Base class for the indexer worker manifests class profile::swh::deploy::indexer { include ::profile::swh::deploy::base_indexer - include ::profile::swh::deploy::objstorage_cloud } diff --git a/site-modules/profile/manifests/swh/deploy/objstorage_cloud.pp b/site-modules/profile/manifests/swh/deploy/objstorage_cloud.pp deleted file mode 100644 index c399f1f4..00000000 --- a/site-modules/profile/manifests/swh/deploy/objstorage_cloud.pp +++ /dev/null @@ -1,9 +0,0 @@ -# Deployment of the cloud objstorage - -class profile::swh::deploy::objstorage_cloud { - $objstorage_packages = ['python3-swh.objstorage.cloud'] - - package {$objstorage_packages: - ensure => installed, - } -} diff --git a/site-modules/profile/manifests/swh/deploy/worker/indexer_content_ctags.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_ctags.pp index a1171396..553902be 100644 --- a/site-modules/profile/manifests/swh/deploy/worker/indexer_content_ctags.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_ctags.pp @@ -1,19 +1,18 @@ # Deployment for swh-indexer-ctags class profile::swh::deploy::worker::indexer_content_ctags { include ::profile::swh::deploy::indexer $packages = ['universal-ctags'] package {$packages: ensure => 'present', } Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_ctags': ensure => 'stopped', require => [ Class['profile::swh::deploy::indexer'], - Class['profile::swh::deploy::objstorage_cloud'], Package[$packages], ], } } diff --git a/site-modules/profile/manifests/swh/deploy/worker/indexer_content_language.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_language.pp index 10b56fa4..ddad4c6e 100644 --- a/site-modules/profile/manifests/swh/deploy/worker/indexer_content_language.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_language.pp @@ -1,14 +1,13 @@ # Deployment for swh-indexer-language class profile::swh::deploy::worker::indexer_content_language { include ::profile::swh::deploy::indexer Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_language': ensure => 'stopped', concurrency => $concurrency, loglevel => $loglevel, require => [ Class['profile::swh::deploy::indexer'], - Class['profile::swh::deploy::objstorage_cloud'], ], } } diff --git a/site-modules/profile/manifests/swh/deploy/worker/indexer_content_mimetype.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_mimetype.pp index c90f5669..7614c706 100644 --- a/site-modules/profile/manifests/swh/deploy/worker/indexer_content_mimetype.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/indexer_content_mimetype.pp @@ -1,13 +1,12 @@ # Deployment for swh-indexer-mimetype class profile::swh::deploy::worker::indexer_content_mimetype { include ::profile::swh::deploy::indexer Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_mimetype': ensure => present, require => [ - Class['profile::swh::deploy::indexer'], - Class['profile::swh::deploy::objstorage_cloud'], + Class['profile::swh::deploy::indexer'] ], } } diff --git a/site-modules/profile/manifests/swh/deploy/worker/indexer_fossology_license.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_fossology_license.pp index 183356b2..42377f82 100644 --- a/site-modules/profile/manifests/swh/deploy/worker/indexer_fossology_license.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/indexer_fossology_license.pp @@ -1,18 +1,17 @@ # Deployment for swh-indexer-fossology-license class profile::swh::deploy::worker::indexer_fossology_license { include ::profile::swh::deploy::indexer $packages = ['fossology-nomossa'] package {$packages: ensure => 'present', } Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_fossology_license': ensure => present, require => [ Class['profile::swh::deploy::indexer'], - Class['profile::swh::deploy::objstorage_cloud'], Package[$packages], ], } } diff --git a/site-modules/profile/manifests/swh/deploy/worker/indexer_origin_intrinsic_metadata.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_origin_intrinsic_metadata.pp index 8e67329f..61bdfc28 100644 --- a/site-modules/profile/manifests/swh/deploy/worker/indexer_origin_intrinsic_metadata.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/indexer_origin_intrinsic_metadata.pp @@ -1,13 +1,12 @@ # Deployment for swh-indexer-origin-intrinsic-metadata class profile::swh::deploy::worker::indexer_origin_intrinsic_metadata { include ::profile::swh::deploy::indexer Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_origin_intrinsic_metadata': ensure => present, require => [ Class['profile::swh::deploy::indexer'], - Class['profile::swh::deploy::objstorage_cloud'], ], } } diff --git a/site-modules/profile/manifests/swh/deploy/worker/indexer_rehash.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_rehash.pp index 5d84e198..f2cdc7ad 100644 --- a/site-modules/profile/manifests/swh/deploy/worker/indexer_rehash.pp +++ b/site-modules/profile/manifests/swh/deploy/worker/indexer_rehash.pp @@ -1,13 +1,12 @@ # Deployment for swh-indexer-rehash class profile::swh::deploy::worker::indexer_rehash { include ::profile::swh::deploy::indexer Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_rehash': ensure => 'stopped', require => [ - Class['profile::swh::deploy::indexer'], - Class['profile::swh::deploy::objstorage_cloud'], + Class['profile::swh::deploy::indexer'] ], } }