diff --git a/data/defaults.yaml b/data/defaults.yaml --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -1212,8 +1212,8 @@ swh::remote_service::scheduler::config: "%{alias('swh::remote_service::scheduler::config::saatchi')}" swh::remote_service::scheduler::config::writable: "%{alias('swh::remote_service::scheduler::config::saatchi')}" -swh::remote_service::vault::config: "%{alias('swh::remote_service::vault::config::orangerie')}" -swh::remote_service::vault::config::writable: "%{alias('swh::remote_service::vault::config::orangerie')}" +swh::remote_service::vault::config: "%{alias('swh::remote_service::vault::config::azure')}" +swh::remote_service::vault::config::writable: "%{alias('swh::remote_service::vault::config::azure')}" # Objstorage backend configurations swh::remote_service::objstorage::config::azure: &swh_objstorage_config_azure @@ -1367,12 +1367,6 @@ # Vault backend configurations -swh::remote_service::vault::config::orangerie: - cls: remote - args: - url: "http://orangerie.internal.softwareheritage.org:%{hiera('swh::remote_service::vault::port')}/" - -# Vault backend configuration on azure swh::remote_service::vault::config::azure: cls: remote args: diff --git a/site-modules/profile/manifests/swh/deploy/base_lister.pp b/site-modules/profile/manifests/swh/deploy/base_lister.pp --- a/site-modules/profile/manifests/swh/deploy/base_lister.pp +++ b/site-modules/profile/manifests/swh/deploy/base_lister.pp @@ -15,6 +15,6 @@ $packages = ['python3-swh.lister'] package {$packages: - ensure => latest, + ensure => present, } } diff --git a/site-modules/profile/manifests/swh/deploy/deposit.pp b/site-modules/profile/manifests/swh/deploy/deposit.pp --- a/site-modules/profile/manifests/swh/deploy/deposit.pp +++ b/site-modules/profile/manifests/swh/deploy/deposit.pp @@ -38,7 +38,7 @@ include ::gunicorn package {$swh_packages: - ensure => latest, + ensure => present, require => Apt::Source['softwareheritage'], notify => Service['gunicorn-swh-deposit'], }