[MediaWiki-commits] [Gerrit] operations/puppet[production]: vagrant: remove setup.sh call
Alexandros Kosiaris has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329723 ) Change subject: vagrant: remove setup.sh call .. vagrant: remove setup.sh call The mediawiki-vagrant Vagrant plugin is no longer installed as a true plugin (c8ca59051837). The unless condition on the setup.sh exec does not keep the exec from firing anymore. Change-Id: I74901190d640016356794d1229e13fe36f3788b5 --- M modules/vagrant/manifests/mediawiki.pp 1 file changed, 0 insertions(+), 15 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/modules/vagrant/manifests/mediawiki.pp b/modules/vagrant/manifests/mediawiki.pp index f1896cc..21beeaa 100644 --- a/modules/vagrant/manifests/mediawiki.pp +++ b/modules/vagrant/manifests/mediawiki.pp @@ -41,27 +41,12 @@ require => User['mwvagrant'], } -exec { 'mediawiki_vagrant_setup': -command => "${install_directory}/setup.sh --silent", -# The first call to vagrant will fail if the plugin isn't installed at -# all. The second call will exit with an error if the plugin is -# installed but out of date. -unless => '/usr/bin/vagrant plugin list | /bin/grep -q mediawiki-vagrant && /usr/bin/vagrant config --list', -cwd => $install_directory, -user=> 'mwvagrant', -environment => [ -"VAGRANT_HOME=${::vagrant::vagrant_home}", -], -require => Git::Clone['mediawiki/vagrant'], -} - file { "${install_directory}/.settings.yaml": ensure => 'present', source => 'puppet:///modules/vagrant/default-settings.yaml', owner => 'mwvagrant', group => 'wikidev', replace => false, -before => Exec['mediawiki_vagrant_setup'], require => Git::Clone['mediawiki/vagrant'], } -- To view, visit https://gerrit.wikimedia.org/r/329723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74901190d640016356794d1229e13fe36f3788b5 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavisGerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Madhuvishy Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: vagrant: remove setup.sh call
BryanDavis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/329723 ) Change subject: vagrant: remove setup.sh call .. vagrant: remove setup.sh call The mediawiki-vagrant Vagrant plugin is no longer installed as a true plugin (c8ca59051837). The unless condition on the setup.sh exec does not keep the exec from firing anymore. Change-Id: I74901190d640016356794d1229e13fe36f3788b5 --- M modules/vagrant/manifests/mediawiki.pp 1 file changed, 0 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/23/329723/1 diff --git a/modules/vagrant/manifests/mediawiki.pp b/modules/vagrant/manifests/mediawiki.pp index f1896cc..21beeaa 100644 --- a/modules/vagrant/manifests/mediawiki.pp +++ b/modules/vagrant/manifests/mediawiki.pp @@ -41,27 +41,12 @@ require => User['mwvagrant'], } -exec { 'mediawiki_vagrant_setup': -command => "${install_directory}/setup.sh --silent", -# The first call to vagrant will fail if the plugin isn't installed at -# all. The second call will exit with an error if the plugin is -# installed but out of date. -unless => '/usr/bin/vagrant plugin list | /bin/grep -q mediawiki-vagrant && /usr/bin/vagrant config --list', -cwd => $install_directory, -user=> 'mwvagrant', -environment => [ -"VAGRANT_HOME=${::vagrant::vagrant_home}", -], -require => Git::Clone['mediawiki/vagrant'], -} - file { "${install_directory}/.settings.yaml": ensure => 'present', source => 'puppet:///modules/vagrant/default-settings.yaml', owner => 'mwvagrant', group => 'wikidev', replace => false, -before => Exec['mediawiki_vagrant_setup'], require => Git::Clone['mediawiki/vagrant'], } -- To view, visit https://gerrit.wikimedia.org/r/329723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74901190d640016356794d1229e13fe36f3788b5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits