Andrew Bogott has submitted this change and it was merged.
Change subject: Include the labs_initial_content role in labs_vagrant.
......................................................................
Include the labs_initial_content role in labs_vagrant.
Change-Id: I8650c90aacfd46dc149c94e8b89846024aa5949e
---
M modules/labs_vagrant/manifests/init.pp
A modules/labs_vagrant/templates/vagrant-managed.pp.erb
2 files changed, 19 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labs_vagrant/manifests/init.pp
b/modules/labs_vagrant/manifests/init.pp
index 94833fb..11cc8a8 100644
--- a/modules/labs_vagrant/manifests/init.pp
+++ b/modules/labs_vagrant/manifests/init.pp
@@ -2,7 +2,11 @@
#
# Configure a labs host to use MediaWiki-Vagrant to manage local wikis
#
-class labs_vagrant {
+# $inital_roles: list of roles to include in labs vagrant before its first
provision.
+#
+class labs_vagrant(
+ $initial_roles = ['labs_initial_content']
+) {
file { '/home/vagrant':
ensure => 'directory',
@@ -56,4 +60,12 @@
mode => '0555',
require => File['/vagrant'],
}
+
+ file { '/vagrant/puppet/manifests/manifests.d/vagrant-managed.pp':
+ ensure => present,
+ replace => false,
+ content => template('labs_vagrant/vagrant-managed.pp.erb'),
+ owner => 'vagrant',
+ require => Exec['git_clone_vagrant'],
+ }
}
diff --git a/modules/labs_vagrant/templates/vagrant-managed.pp.erb
b/modules/labs_vagrant/templates/vagrant-managed.pp.erb
new file mode 100644
index 0000000..1032fe8
--- /dev/null
+++ b/modules/labs_vagrant/templates/vagrant-managed.pp.erb
@@ -0,0 +1,6 @@
+# This file is managed by Vagrant. Do not edit.
+# Use "vagrant list-roles / enable-role / disable-role" instead.
+
+<% initial_roles.each do | role | -%>
+include role::<%=role%>
+<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/132721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8650c90aacfd46dc149c94e8b89846024aa5949e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
