Alexandros Kosiaris has submitted this change and it was merged.
Change subject: labs: Set Vagrant Puppet environment in mwvagrant wrapper
......................................................................
labs: Set Vagrant Puppet environment in mwvagrant wrapper
Use the functionality introduced in I36a0c7a to set the hiera
environment to 'labs' when using the mwvagrant wrapper script to run
Vagrant. This combined with the provider specific hiera settings
introduced in the same upstream change allows removing the local.yaml
hiera configuration entirely. The same default settings will now be
loaded from 'environment/labs.yaml' and 'provider/lxc.yaml' instead.
Change-Id: I9501b32528bdafb8c46105a8d5d1908a3c07b885
---
D modules/vagrant/files/hieradata/local.yaml
M modules/vagrant/manifests/mediawiki.pp
M modules/vagrant/templates/mwvagrant.erb
3 files changed, 1 insertion(+), 22 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/vagrant/files/hieradata/local.yaml
b/modules/vagrant/files/hieradata/local.yaml
deleted file mode 100644
index 1118c97..0000000
--- a/modules/vagrant/files/hieradata/local.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-classes: ['::role::labs_initial_content']
-
-role::mediawiki::hostname: "%{::hostname}.wmflabs.org"
-mediawiki::multiwiki::base_domain: "-%{::hostname}.wmflabs.org"
-
-# Disable cachefilesd usage
-mwv::enable_cachefilesd: false
diff --git a/modules/vagrant/manifests/mediawiki.pp
b/modules/vagrant/manifests/mediawiki.pp
index 2513fa5..3d5c9f9 100644
--- a/modules/vagrant/manifests/mediawiki.pp
+++ b/modules/vagrant/manifests/mediawiki.pp
@@ -53,17 +53,4 @@
],
require => Git::Clone['mediawiki/vagrant'],
}
-
- # Create a local.yaml unless one already exists. This allows the user to
- # modify the defaults and add additional settings as needed without
- # fighting with Puppet over the contents of the file.
- file { "${install_directory}/puppet/hieradata/local.yaml":
- ensure => 'present',
- source => 'puppet:///modules/vagrant/hieradata/local.yaml',
- owner => 'mwvagrant',
- group => 'wikidev',
- mode => '0664',
- replace => false,
- require => Git::Clone['mediawiki/vagrant'],
- }
}
diff --git a/modules/vagrant/templates/mwvagrant.erb
b/modules/vagrant/templates/mwvagrant.erb
index 631e90c..941ec04 100755
--- a/modules/vagrant/templates/mwvagrant.erb
+++ b/modules/vagrant/templates/mwvagrant.erb
@@ -5,4 +5,4 @@
# Adding `alias vagrant=/usr/local/bin/mwvagrant` to your shell will make
# usage more natural.
-exec sudo -u mwvagrant -n -- /usr/bin/env VAGRANT_HOME=<%= @vagrant_home %>
/usr/bin/vagrant "$@"
+exec sudo -u mwvagrant -n -- /usr/bin/env VAGRANT_HOME="<%= @vagrant_home %>"
MWV_ENVIRONMENT="labs" /usr/bin/vagrant "$@"
--
To view, visit https://gerrit.wikimedia.org/r/232532
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9501b32528bdafb8c46105a8d5d1908a3c07b885
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
