BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161325
Change subject: Remove legacy manifests.d/vagrant-managed.pp
......................................................................
Remove legacy manifests.d/vagrant-managed.pp
The modern MediaWiki-Vagrant uses hiera to manage applied roles and
includes configuration to install role::labs_initial_content when the
"labs" environment is used.
Change-Id: I811c40e5d0db65d55f786bdec4e4b1bf44c863d4
---
M modules/labs_vagrant/manifests/init.pp
D modules/labs_vagrant/templates/vagrant-managed.pp.erb
2 files changed, 0 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/161325/1
diff --git a/modules/labs_vagrant/manifests/init.pp
b/modules/labs_vagrant/manifests/init.pp
index 42954a9..42f7fe7 100644
--- a/modules/labs_vagrant/manifests/init.pp
+++ b/modules/labs_vagrant/manifests/init.pp
@@ -5,12 +5,9 @@
# == Parameters:
# - $install_directory: Directory to install MediaWiki-Vagrant in.
# Default /srv/vagrant
-# - $inital_roles: list of roles to include in labs vagrant before its first
-# provision. Default ['labs_initial_content']
#
class labs_vagrant(
$install_directory = '/srv/vagrant',
- $initial_roles = ['labs_initial_content'],
) {
$legacy_directory = '/mnt/vagrant'
@@ -61,13 +58,5 @@
target => '/vagrant/lib/labs-vagrant.rb',
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 => Git::Clone['vagrant'],
}
}
diff --git a/modules/labs_vagrant/templates/vagrant-managed.pp.erb
b/modules/labs_vagrant/templates/vagrant-managed.pp.erb
deleted file mode 100644
index 1032fe8..0000000
--- a/modules/labs_vagrant/templates/vagrant-managed.pp.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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/161325
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I811c40e5d0db65d55f786bdec4e4b1bf44c863d4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
