Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226232
Change subject: Labs: Let Puppet install mpt-status
......................................................................
Labs: Let Puppet install mpt-status
Change da2f050608bd6c7bf2856c3e528fef3b50d56de3 fixed useless
mpt-status mails by installing the configuration file with
"RUN_DAEMON=no" for mpt-status before the package was installed.
However in Labs images, mpt-status is already installed in the base
image and at the first boot, the mpt-status daemon is started before
Puppet creates the configuration file, thus firing off the mails until
reboot or manually killing the daemon.
This could be fixed by adding /etc/default/mpt-statusd to the list of
files to be copied from the VM builder machine to the base image; on
the other hand this would introduce another non-obvious dependence
which would miss fixes like da2f050608bd6c7bf2856c3e528fef3b50d56de3.
Instead this change lets Puppet install mpt-status after the
configuration file has been created.
Bug: T104779
Change-Id: Ie52618f946685473797f6b4d2ed924e065b3d689
---
M modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
M modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/226232/1
diff --git a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
index 96cb011..dc60b6a 100644
--- a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
@@ -84,7 +84,6 @@
- debian-goodies
- python-redis
- python-apt
- - mpt-status
- apt-show-versions
- pv
- nagios-plugins-standard
diff --git a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
index 08ea518..0295e0c 100644
--- a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
+++ b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
@@ -17,8 +17,8 @@
mirror = http://ubuntu.wikimedia.org/ubuntu/
components = main,restricted,multiverse,universe
<% if scope.function_os_version(['ubuntu >= trusty']) %>
-addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen,
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git-core, lldpd, emacs23,
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd,
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert,
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools,
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client,
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt,
mpt-status, python-statsd, apt-show-versions, pv, nagios-plugins-standard,
httpry, nagios-plugins, linux-tools-generic, puppet-lint, tree,
nagios-plugins-basic, jq
+addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen,
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git-core, lldpd, emacs23,
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd,
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert,
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools,
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client,
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt,
python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry,
nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, jq
<% else %>
-addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen,
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git-core, lldpd, emacs23,
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd,
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert,
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools,
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client,
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt,
mpt-status, apt-show-versions, pv, nagios-plugins-standard, nagios-plugins,
puppet-lint, tree, nagios-plugins-basic
+addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen,
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git-core, lldpd, emacs23,
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd,
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert,
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools,
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client,
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt,
apt-show-versions, pv, nagios-plugins-standard, nagios-plugins, puppet-lint,
tree, nagios-plugins-basic
<% end %>
removepkg = mlocate
--
To view, visit https://gerrit.wikimedia.org/r/226232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie52618f946685473797f6b4d2ed924e065b3d689
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
