Skip to content

Commit

Permalink
use stdlib::ensure_packages to avoid warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
evgeni committed May 21, 2024
1 parent 3eef426 commit 480b143
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion puppet/modules/discourse/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Stdlib::Absolutepath $root = '/var/discourse',
Stdlib::Host $hostname = 'community.theforeman.org',
) {
ensure_packages(['git'])
stdlib::ensure_packages(['git'])

vcsrepo { $root:
ensure => present,
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/freight/manifests/user.pp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
) {
require freight

ensure_packages(['ruby'])
stdlib::ensure_packages(['ruby'])

file { "${home}/freight.conf":
ensure => file,
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/jenkins_job_builder/manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
$inifile = "${directory}/jenkins_jobs_${config_name}.ini"

$git = if $facts['os']['release']['major'] == '7' { 'git' } else { 'git-core' }
ensure_packages([$git])
stdlib::ensure_packages([$git])

vcsrepo { "${directory}/${git_project_name}":
ensure => latest,
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/jenkins_job_builder/manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
String[1] $ensure = $jenkins_job_builder::ensure,
) {
$yaml = if $facts['os']['release']['major'] == '7' { 'PyYAML' } else { 'python3-pyyaml' }
ensure_packages(['python-pip', $yaml])
stdlib::ensure_packages(['python-pip', $yaml])

package { 'jenkins-job-builder':
ensure => $jenkins_job_builder::ensure,
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/jenkins_node/manifests/packaging/debian.pp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
ensure => present,
}

ensure_packages(['python3-pip', 'python3-setuptools', 'zstd'])
stdlib::ensure_packages(['python3-pip', 'python3-setuptools', 'zstd'])

if $facts['os']['name'] == 'Debian' {
include apt::backports
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/jenkins_node/manifests/packaging/rpm.pp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
'python3-pyyaml',
]

ensure_packages($obal_packages + $foreman_rel_eng_packages)
stdlib::ensure_packages($obal_packages + $foreman_rel_eng_packages)

# specs-from-koji
package { ['scl-utils-build', 'rpmdevtools']:
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/jenkins_node/manifests/rbenv.pp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
user => 'jenkins',
}

ensure_packages(['gcc-c++'])
stdlib::ensure_packages(['gcc-c++'])

rbenv::build { '3.1.0': }
rbenv::build { '3.0.4': }
Expand Down
8 changes: 4 additions & 4 deletions puppet/modules/jenkins_node/manifests/unittests.pp
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
default => 'libyaml-devel'
}

ensure_packages([$libxml2_dev, $libxslt1_dev, $libkrb5_dev, $systemd_dev, 'freeipmi', 'ipmitool', $firefox, $libvirt_dev, $libcurl_dev,
$sqlite3_dev, $libyaml_dev])
stdlib::ensure_packages([$libxml2_dev, $libxslt1_dev, $libkrb5_dev, $systemd_dev, 'freeipmi', 'ipmitool',
$firefox, $libvirt_dev, $libcurl_dev, $sqlite3_dev, $libyaml_dev])

ensure_packages(['python3-virtualenv'])
stdlib::ensure_packages(['python3-virtualenv'])

# nodejs/npm for JavaScript tests
if $facts['os']['family'] == 'RedHat' {
Expand Down Expand Up @@ -116,7 +116,7 @@

# Needed for foreman-selinux testing
if $facts['os']['family'] == 'RedHat' {
ensure_packages(['selinux-policy-devel'])
stdlib::ensure_packages(['selinux-policy-devel'])
}

# Needed by foreman_openscap gem dependency OpenSCAP
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/profiles/manifests/discourse.pp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
gpgkey => 'https://download.docker.com/linux/centos/gpg',
}

ensure_packages(['docker-ce'], { require => Yumrepo['docker-ce-stable'] })
stdlib::ensure_packages(['docker-ce'], { require => Yumrepo['docker-ce-stable'] })

service { 'docker':
ensure => 'running',
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/profiles/manifests/jenkins/controller.pp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
Array[String[1]] $packages = ['java-11-openjdk-headless', 'java-11-openjdk-devel', 'fontconfig'],
Array[String[1]] $plugins = [],
) {
ensure_packages($packages)
stdlib::ensure_packages($packages)

class { 'jenkins':
install_java => false,
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/redmine/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
'make',
]

ensure_packages($packages)
stdlib::ensure_packages($packages)

# Prevents errors if run from /root etc.
Postgresql_psql {
Expand Down
4 changes: 2 additions & 2 deletions puppet/modules/utility/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
default => 'vim',
}

ensure_packages([$vim])
stdlib::ensure_packages([$vim])

unless $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8' {
ensure_packages(['htop', 'iftop', 'screen'])
stdlib::ensure_packages(['htop', 'iftop', 'screen'])
}

# TODO: rsync package is managed by puppetlabs-rsync
Expand Down

0 comments on commit 480b143

Please sign in to comment.