jenkins-bot has submitted this change and it was merged.
Change subject: Box Virtualbox-specific configs in 'virtualbox' module
......................................................................
Box Virtualbox-specific configs in 'virtualbox' module
The set of Puppet manifests and modules that ship with MediaWiki-Vagrant are
generic enough to be useful for setups other than just Vagrant on VirtualBox.
This patch concentrates all VirtualBox-specific Puppet code in a 'virtualbox'
module and ensures it is only loaded on Vagrant/Virtualbox.
Bug: 54160
Change-Id: I2a7fc2db3bbe62dbda1c4f1250674aeea135e142
---
M Vagrantfile
M puppet/modules/misc/manifests/init.pp
R puppet/modules/virtualbox/files/check-guest-additions.sh
R puppet/modules/virtualbox/files/update-guest-additions
R puppet/modules/virtualbox/manifests/init.pp
5 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Vagrantfile b/Vagrantfile
index efae4c4..88f7549 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -94,9 +94,10 @@
puppet.options << '--color=false' if windows?
puppet.facter = {
+ 'forwarded_port' => FORWARDED_PORT,
+ 'vagrant_provider' => 'virtualbox',
'virtualbox_version' => virtualbox_version,
'shared_apt_cache' => '/vagrant/apt-cache/',
- 'forwarded_port' => FORWARDED_PORT,
}
end
end
diff --git a/puppet/modules/misc/manifests/init.pp
b/puppet/modules/misc/manifests/init.pp
index 40f020f..0af6d83 100644
--- a/puppet/modules/misc/manifests/init.pp
+++ b/puppet/modules/misc/manifests/init.pp
@@ -5,8 +5,6 @@
# command-line tools, like 'ack' and 'curl'.
#
class misc {
- include misc::virtualbox
-
# This solves the 'stdin: not a tty' error message, which is caused
# by a call to 'mesg n' in /root/.profile. Sadly it'll still appear
# once, since profile is sourced before Puppet can run. That sucks,
@@ -16,6 +14,10 @@
onlyif => 'grep -q "^mesg n" /root/.profile',
}
+ if $vagrant_provider == 'virtualbox' {
+ class { 'virtualbox': }
+ }
+
file { '/var/lib/cloud/instance/':
ensure => directory,
}
diff --git a/puppet/modules/misc/files/check-guest-additions.sh
b/puppet/modules/virtualbox/files/check-guest-additions.sh
similarity index 100%
rename from puppet/modules/misc/files/check-guest-additions.sh
rename to puppet/modules/virtualbox/files/check-guest-additions.sh
diff --git a/puppet/modules/misc/files/update-guest-additions
b/puppet/modules/virtualbox/files/update-guest-additions
similarity index 100%
rename from puppet/modules/misc/files/update-guest-additions
rename to puppet/modules/virtualbox/files/update-guest-additions
diff --git a/puppet/modules/misc/manifests/virtualbox.pp
b/puppet/modules/virtualbox/manifests/init.pp
similarity index 86%
rename from puppet/modules/misc/manifests/virtualbox.pp
rename to puppet/modules/virtualbox/manifests/init.pp
index cf851d7..18a2f6f 100644
--- a/puppet/modules/misc/manifests/virtualbox.pp
+++ b/puppet/modules/virtualbox/manifests/init.pp
@@ -1,4 +1,4 @@
-# == Class: misc::virtualbox
+# == Class: virtualbox
#
# Provides a set of helpers for managing upgrades of VirtualBox Guest
# Additions. This includes populating a file in /etc/virtualbox-version
@@ -7,17 +7,17 @@
# the user to upgrade if it is. Upgrading is done using an
# 'update-guest-additions' script which is also installed by this module.
#
-class misc::virtualbox {
+class virtualbox {
# Upon starting an interactive shell, check guest additions version and
# prompt the user to update if out-of-date.
env::profile { 'check guest additions':
- source => 'puppet:///modules/misc/check-guest-additions.sh',
+ source => 'puppet:///modules/virtualbox/check-guest-additions.sh',
}
# Shell script for updating guest additions.
file { '/bin/update-guest-additions':
ensure => present,
- source => 'puppet:///modules/misc/update-guest-additions',
+ source => 'puppet:///modules/virtualbox/update-guest-additions',
owner => 'root',
group => 'root',
mode => '0755',
--
To view, visit https://gerrit.wikimedia.org/r/84431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a7fc2db3bbe62dbda1c4f1250674aeea135e142
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
