puppet: Ensure that all scripts/lib/install packages are installed.

These have all been required packages for some time, but this helps
keep the install-time list more clearly a subset of the upgrade-time
list.
This commit is contained in:
Alex Vandiver
2021-03-12 12:47:49 -08:00
committed by Tim Abbott
parent 32df287818
commit 52f155873f
2 changed files with 17 additions and 7 deletions

View File

@@ -33,13 +33,18 @@ class zulip::profile::base {
'20.04' => 'focal', '20.04' => 'focal',
} }
$base_packages = [ $base_packages = [
# Accurate time is essential # Basics
'ntp', 'python3',
'puppet',
'git',
# Used in scripts including install-yarn.sh # Used in scripts including install-yarn.sh
'curl', 'curl',
'wget', 'wget',
'jq',
# Used to read /etc/zulip/zulip.conf for `zulipconf` Puppet function # Used to read /etc/zulip/zulip.conf for `zulipconf` Puppet function
'crudini', 'crudini',
# Accurate time is essential
'ntp',
# Used for tools like sponge # Used for tools like sponge
'moreutils', 'moreutils',
# Nagios monitoring plugins # Nagios monitoring plugins
@@ -53,10 +58,14 @@ class zulip::profile::base {
'redhat': { 'redhat': {
$release_name = "${::operatingsystem}${::operatingsystemmajrelease}" $release_name = "${::operatingsystem}${::operatingsystemmajrelease}"
$base_packages = [ $base_packages = [
'ntp', 'python3',
'puppet',
'git',
'curl', 'curl',
'wget', 'wget',
'jq',
'crudini', 'crudini',
'ntp',
'moreutils', 'moreutils',
'nmap-ncat', 'nmap-ncat',
'nagios-plugins', # there is no dummy package on CentOS 7 'nagios-plugins', # there is no dummy package on CentOS 7

View File

@@ -323,9 +323,11 @@ if [ -z "$NO_DIST_UPGRADE" ]; then
fi fi
if [ "$package_system" = apt ]; then if [ "$package_system" = apt ]; then
# Note that any additions to these lists must also be added to
# `zulip::profile::base` such that the new dependency is seen by
# upgrades, as well as new installs.
if ! apt-get install -y \ if ! apt-get install -y \
puppet git curl wget jq \ python3 puppet git curl wget jq crudini \
python3 crudini \
"${ADDITIONAL_PACKAGES[@]}"; then "${ADDITIONAL_PACKAGES[@]}"; then
set +x set +x
echo -e '\033[0;31m' >&2 echo -e '\033[0;31m' >&2
@@ -336,8 +338,7 @@ if [ "$package_system" = apt ]; then
fi fi
elif [ "$package_system" = yum ]; then elif [ "$package_system" = yum ]; then
if ! yum install -y \ if ! yum install -y \
puppet git curl wget jq \ python3 puppet git curl wget jq crudini \
python3 crudini \
"${ADDITIONAL_PACKAGES[@]}"; then "${ADDITIONAL_PACKAGES[@]}"; then
set +x set +x
echo -e '\033[0;31m' >&2 echo -e '\033[0;31m' >&2