Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/307999
Change subject: Revert "Pare down the cloud-init commands on precise"
......................................................................
Revert "Pare down the cloud-init commands on precise"
Cloud-init was throwing warnings but I think this was all
a red herring. The real issue is sshd crashing, which
should already be fixed in a separate patch.
There may still be issues with cloud-init failing on precise;
if that's true I'll just fall back on the default precise-installed
version.
This reverts commit beeaded480631eedc0583f3f5df88becf80a02cb.
This reverts commit fb2b39c018a193cb94e0d8093291106c9eb205ec.
This reverts commit adc1573ca9ec564e417182851109546d5b942249.
This reverts commit ebe22f12ffdb7e2e52b2ec94938faad78f0c5169.
Change-Id: I2541080244777ec0ffde4c0a3d4ad4325e9720da
---
R modules/labs_vmbuilder/files/cloud.cfg
M modules/labs_vmbuilder/manifests/init.pp
2 files changed, 14 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/307999/1
diff --git a/modules/labs_vmbuilder/templates/cloud.cfg.erb
b/modules/labs_vmbuilder/files/cloud.cfg
similarity index 88%
rename from modules/labs_vmbuilder/templates/cloud.cfg.erb
rename to modules/labs_vmbuilder/files/cloud.cfg
index 7753670..1b3da3f 100644
--- a/modules/labs_vmbuilder/templates/cloud.cfg.erb
+++ b/modules/labs_vmbuilder/files/cloud.cfg
@@ -22,65 +22,57 @@
# The modules that run in the 'init' stage
cloud_init_modules:
+ - migrator
+ - seed_random
- bootcmd
+ - write-files
+ - growpart
- resizefs
- set_hostname
- update_hostname
- update_etc_hosts
- ca-certs
- rsyslog
- - ssh
-<% if scope.function_os_version(['ubuntu >= trusty']) %>
- - migrator
- - seed_random
- - write-files
- - growpart
- users-groups
-<% end %>
+ - ssh
# The modules that run in the 'config' stage
cloud_config_modules:
# Emit the cloud config ready event
# this can be used by upstart jobs for 'start on cloud-config'.
+ - emit_upstart
+ - disk_setup
- mounts
- locale
- set-passwords
- grub-dpkg
- apt-pipelining
+ - apt-configure
+ - package-update-upgrade-install
- landscape
- timezone
- mcollective
- disable-ec2-metadata
- runcmd
- byobu
-<% if scope.function_os_version(['ubuntu >= trusty']) %>
- - disk_setup
- - emit_upstart
- - apt-configure
- - package-update-upgrade-install
-<% end %>
# The modules that run in the 'final' stage
cloud_final_modules:
- rightscale_userdata
+ - scripts-vendor
- scripts-per-once
- scripts-per-boot
+ - scripts-per-instance
- scripts-user
+ - ssh-authkey-fingerprints
- keys-to-console
- phone-home
- final-message
-<% if scope.function_os_version(['ubuntu >= trusty']) %>
- - scripts-vendor
- - ssh-authkey-fingerprints
- power-state-change
-<% end %>
-# We would uncomment this if we had things to run on every boot
-# - scripts-per-instance
-system_info:
-<% if scope.function_os_version(['ubuntu >= trusty']) %>
# System and/or distro specific settings
# (not accessible to handlers/transforms)
+system_info:
# This will affect which distro class gets used
distro: ubuntu
# Default user name + that default users groups (if added/used)
@@ -96,7 +88,6 @@
cloud_dir: /var/lib/cloud/
templates_dir: /etc/cloud/templates/
upstart_dir: /etc/init/
-<% end %>
package_mirrors:
- arches: [i386, amd64]
failsafe:
diff --git a/modules/labs_vmbuilder/manifests/init.pp
b/modules/labs_vmbuilder/manifests/init.pp
index f25b545..0462238 100644
--- a/modules/labs_vmbuilder/manifests/init.pp
+++ b/modules/labs_vmbuilder/manifests/init.pp
@@ -31,7 +31,7 @@
file { '/etc/vmbuilder/files/cloud.cfg':
mode => '0444',
- content => template('labs_vmbuilder/cloud.cfg.erb'),
+ source => 'puppet:///modules/labs_vmbuilder/cloud.cfg',
require => Package['python-vm-builder'],
}
--
To view, visit https://gerrit.wikimedia.org/r/307999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2541080244777ec0ffde4c0a3d4ad4325e9720da
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
