diff --git a/manifests/puppet/base.pp b/manifests/puppet/base.pp index 84515af..28cd22c 100644 --- a/manifests/puppet/base.pp +++ b/manifests/puppet/base.pp @@ -1,69 +1,57 @@ # Base puppet configuration for all hosts. class profile::puppet::base { $puppetmaster = lookup('puppet::master::hostname') $agent_config = { runmode => 'none', pluginsync => true, puppetmaster => $puppetmaster, additional_settings => { environment_data_provider => 'hiera', }, } file { '/usr/local/sbin/swh-puppet-test': ensure => 'file', owner => 'root', group => 'root', mode => '0755', content => template('profile/puppet/swh-puppet-test.sh.erb'), } file { '/usr/local/sbin/swh-puppet-apply': ensure => 'file', owner => 'root', group => 'root', mode => '0755', content => template('profile/puppet/swh-puppet-apply.sh.erb'), } # Backported packages - if $::lsbdistcodename == 'jessie' { - $pinned_packages = [ - 'facter', - 'hiera', - 'puppet', - 'puppet-common', - 'puppetmaster', - 'puppetmaster-common', - 'puppetmaster-passenger', - 'ruby-deep-merge', - ] - } - elsif $::lsbdistcodename == 'stretch' { + if $::lsbdistcodename == 'stretch' { $pinned_packages = [ 'facter', 'libfacter*', 'libleatherman*', 'libleatherman-data', 'libcpp-hocon*', ] } else { $pinned_packages = undef } if $pinned_packages { ::apt::pin {'puppet': explanation => 'Pin puppet dependencies to backports', codename => "${::lsbdistcodename}-backports", packages => $pinned_packages, priority => 990, } } else { ::apt::pin {'puppet': ensure => 'absent', } } } diff --git a/manifests/swh/deploy/base_lister.pp b/manifests/swh/deploy/base_lister.pp index ffd071c..349c176 100644 --- a/manifests/swh/deploy/base_lister.pp +++ b/manifests/swh/deploy/base_lister.pp @@ -1,33 +1,20 @@ # deployment for the lister package class profile::swh::deploy::base_lister { $config_dir = '/etc/softwareheritage/lister' # Contains passwords file {$config_dir: ensure => 'directory', owner => 'swhworker', group => 'swhdev', mode => '0644', purge => true, recurse => true, } $packages = ['python3-swh.lister'] package {$packages: ensure => 'installed', } - - if $::lsbdistcodename == 'jessie' { - $pinned_packages = [ - 'python3-sqlalchemy', - ] - - ::apt::pin {'swh-lister-base': - explanation => 'Pin swh.lister dependencies to backports', - codename => 'jessie-backports', - packages => $pinned_packages, - priority => 990, - } -> Package[$packages] - } } diff --git a/manifests/swh/deploy/objstorage_cloud.pp b/manifests/swh/deploy/objstorage_cloud.pp index 9741fd4..ae7936a 100644 --- a/manifests/swh/deploy/objstorage_cloud.pp +++ b/manifests/swh/deploy/objstorage_cloud.pp @@ -1,22 +1,17 @@ # Deployment of the cloud objstorage class profile::swh::deploy::objstorage_cloud { $pinned_packages = [ 'python3-cffi', 'python3-cryptography', 'python3-pkg-resources', 'python3-pyasn1', 'python3-setuptools', ] $objstorage_packages = ['python3-swh.objstorage.cloud'] - ::apt::pin {'objstorage_cloud': - explanation => 'Pin python3-azure-storage dependencies to backports', - codename => 'jessie-backports', - packages => $pinned_packages, - priority => 990, - } -> package {$objstorage_packages: + package {$objstorage_packages: ensure => installed, } } diff --git a/manifests/swh/deploy/worker/swh_loader_debian.pp b/manifests/swh/deploy/worker/swh_loader_debian.pp index 03ea6d3..d0e8c8b 100644 --- a/manifests/swh/deploy/worker/swh_loader_debian.pp +++ b/manifests/swh/deploy/worker/swh_loader_debian.pp @@ -1,52 +1,39 @@ # Deployment for swh-loader-debian class profile::swh::deploy::worker::swh_loader_debian { $concurrency = lookup('swh::deploy::worker::swh_loader_debian::concurrency') $loglevel = lookup('swh::deploy::worker::swh_loader_debian::loglevel') $task_broker = lookup('swh::deploy::worker::swh_loader_debian::task_broker') $config_file = '/etc/softwareheritage/loader/debian.yml' $config = lookup('swh::deploy::worker::swh_loader_debian::config') $task_modules = ['swh.loader.debian.tasks'] $task_queues = ['swh_loader_debian'] - if $::lsbdistcodename == 'jessie' { - $pinned_packages = [ - 'python3-sqlalchemy', - ] - - ::apt::pin {'swh-loader-debian': - explanation => 'Pin swh.loader.debian dependencies to backports', - codename => 'jessie-backports', - packages => $pinned_packages, - priority => 990, - } - } - $packages = ['python3-swh.loader.debian'] package {$packages: ensure => 'present', } ::profile::swh::deploy::worker::instance {'swh_loader_debian': ensure => present, concurrency => $concurrency, loglevel => $loglevel, task_broker => $task_broker, task_modules => $task_modules, task_queues => $task_queues, require => [ Package[$packages], File[$config_file], ], } file {$config_file: ensure => 'present', owner => 'swhworker', group => 'swhworker', mode => '0644', content => inline_template("<%= @config.to_yaml %>\n"), } } diff --git a/manifests/systemd_journal/apt_config.pp b/manifests/systemd_journal/apt_config.pp index e9c71b4..4291270 100644 --- a/manifests/systemd_journal/apt_config.pp +++ b/manifests/systemd_journal/apt_config.pp @@ -1,26 +1,3 @@ # Manage the configuration of apt for the systemd journal class profile::systemd_journal::apt_config { - if $::lsbdistcodename == 'jessie' { - $pinned_packages = [ - 'apparmor', - 'ifupdown', - 'libapparmor1', - 'libseccomp2', - 'libsystemd0', - 'libudev1', - 'python-systemd', - 'python3-systemd', - 'systemd', - 'systemd-journal-remote', - 'systemd-sysv', - 'udev', - ] - - ::apt::pin {'systemd': - explanation => 'Pin systemd dependencies to backports', - codename => 'jessie-backports', - packages => $pinned_packages, - priority => 990, - } - } }