Mark Bergsma has submitted this change and it was merged.
Change subject: Add labsvagrant helper script to help manage labsvagrant roles
......................................................................
Add labsvagrant helper script to help manage labsvagrant roles
Is replacement for 'vagrant' command used in mediawiki/vagrant.
The script was added to mediawiki/vagrant.git in Change
If2366ee94475c54d23b12abf4eac3fe84c36b8f5
Change-Id: I955079f6d209630b5ff209a9cd695ba6ec620e3f
---
D modules/labsvagrant/files/vagrant-puppet-runner.bash
M modules/labsvagrant/manifests/init.pp
2 files changed, 6 insertions(+), 24 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labsvagrant/files/vagrant-puppet-runner.bash
b/modules/labsvagrant/files/vagrant-puppet-runner.bash
deleted file mode 100644
index c4442e7..0000000
--- a/modules/labsvagrant/files/vagrant-puppet-runner.bash
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Apply vagrant puppet configuration to this host.
-
-VAGRANT_HOME=/vagrant
-PUPPET_HOME=${VAGRANT_HOME}/puppet
-MANIFEST=${PUPPET_HOME}/manifests/site.pp
-
-exec puppet apply \
- --modulepath ${PUPPET_HOME}/modules \
- --manifestdir ${PUPPET_HOME}/manifests \
- --templatedir ${PUPPET_HOME}/templates \
- --fileserverconfig ${PUPPET_HOME}/extra/fileserver.conf \
- --config_version ${PUPPET_HOME}/extra/config-version \
- --verbose \
- --logdest ${VAGRANT_HOME}/logs/puppet/puppet-$(date +%Y%m%dT%H%M).log \
- --logdest console \
- --detailed-exitcodes \
- ${MANIFEST}
diff --git a/modules/labsvagrant/manifests/init.pp
b/modules/labsvagrant/manifests/init.pp
index 82eab4b..fa5ae70 100644
--- a/modules/labsvagrant/manifests/init.pp
+++ b/modules/labsvagrant/manifests/init.pp
@@ -16,16 +16,16 @@
require => [ User['vagrant'], Exec['git_clone_vagrant'] ]
}
- file { '/vagrant/':
+ file { '/vagrant':
ensure => 'link',
target => '/mnt/vagrant',
require => File['/mnt/vagrant']
}
- file { '/bin/vagrant-puppet-runner':
- ensure => 'present',
- source => 'puppet:///modules/labsvagrant/vagrant-puppet-runner.bash',
- mode => 0755,
- owner => 'root'
+ file { '/bin/labsvagrant':
+ ensure => 'link',
+ target => '/vagrant/lib/labsvagrant.rb',
+ mode => '0555',
+ require => File['/vagrant']
}
}
--
To view, visit https://gerrit.wikimedia.org/r/86083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I955079f6d209630b5ff209a9cd695ba6ec620e3f
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
