Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403355 )

Change subject: vmbuilder: include linux-image-generic in trusty base image
......................................................................

vmbuilder: include linux-image-generic in trusty base image

This is the package that includes the meltdown fix.

Change-Id: I5d08560b32dadf6ec5183b14fb0261aeabe8da03
---
M modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/403355/1

diff --git a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb 
b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
index 7b8a068..21ad7d7 100644
--- a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
+++ b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
@@ -16,7 +16,7 @@
 mirror = http://mirrors.wikimedia.org/ubuntu/
 components = main,restricted,multiverse,universe
 <% if scope.function_os_version(['ubuntu >= trusty']) %>
-addpkg = coreutils, snmp, wipe, tzdata, zsh, jfsutils, xfsprogs, screen, gdb, 
iperf, atop, htop, vim, sysstat, ngrep, acct, git, 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, moreutils, molly-guard, dstat, tshark, tmux, ncdu, ntp, 
command-not-found-data, os-prober, python3-apport, linux-tools-generic, 
apt-listchanges, apport, command-not-found, wpasupplicant, mlocate, 
ecryptfs-utils, nagios-nrpe-server
+addpkg = coreutils, snmp, wipe, tzdata, zsh, jfsutils, xfsprogs, screen, gdb, 
iperf, atop, htop, vim, sysstat, ngrep, acct, git, 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, moreutils, molly-guard, dstat, tshark, tmux, ncdu, ntp, 
command-not-found-data, os-prober, python3-apport, linux-tools-generic, 
apt-listchanges, apport, command-not-found, wpasupplicant, mlocate, 
ecryptfs-utils, nagios-nrpe-server, linux-image-generic
 <% else %>
 addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, 
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git, 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 %>

-- 
To view, visit https://gerrit.wikimedia.org/r/403355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d08560b32dadf6ec5183b14fb0261aeabe8da03
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to