jenkins-bot has submitted this change and it was merged.
Change subject: Fix hiera provider selection
......................................................................
Fix hiera provider selection
Follow up to I36a0c7a that uses the previously existing 'provider_name'
fact injected via mediawiki-vagrant middleware instead of settings hack
that didn't actually work.
Bug: T107146
Change-Id: Iaebf718fc4bf57006507334805f81681ea207e97
---
M Vagrantfile
M puppet/hiera.yaml
2 files changed, 1 insertion(+), 17 deletions(-)
Approvals:
Dduvall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Vagrantfile b/Vagrantfile
index 9028f6b..8b2b8a7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -66,9 +66,6 @@
override.vm.box_download_insecure = true
override.vm.network :private_network, ip: settings[:static_ip]
-
- # https://github.com/mitchellh/vagrant/issues/1867
- settings[:provider] = 'virtualbox'
end
# VMWare Fusion provider. Enable with `--provider=vmware_fusion`
@@ -76,9 +73,6 @@
override.vm.box = 'puppetlabs/ubuntu-14.04-64-puppet'
override.vm.network :private_network, ip: settings[:static_ip]
-
- # https://github.com/mitchellh/vagrant/issues/1867
- settings[:provider] = 'vmware_fusion'
end
# Microsoft Hyper-V provider. Enable with `--provider=hyperv`
@@ -95,18 +89,12 @@
override.vm.box = 'cirex/ubuntu-14.04'
override.vm.network :private_network, ip: settings[:static_ip]
-
- # https://github.com/mitchellh/vagrant/issues/1867
- settings[:provider] = 'hyperv'
end
# LXC provider. Enable wtih `--provider=lxc`
# Requires vagrant-lxc plugin and Vagrant 1.7+
config.vm.provider :lxc do |lxc, override|
override.vm.box = 'Wikimedia/trusty64-puppet-lxc'
-
- # https://github.com/mitchellh/vagrant/issues/1867
- settings[:provider] = 'lxc'
end
# Parallels provider. Enable with `--provider=parallels`
@@ -126,9 +114,6 @@
override.puppet_install.puppet_version = '3.7.4'
override.vm.network :private_network, ip: settings[:static_ip]
-
- # https://github.com/mitchellh/vagrant/issues/1867
- settings[:provider] = 'parallels'
end
config.vm.network :forwarded_port,
@@ -235,7 +220,6 @@
'forwarded_port' => settings[:http_port],
'shared_apt_cache' => '/vagrant/cache/apt/',
'environment' => ENV['MWV_ENVIRONMENT'] || 'vagrant',
- 'provider' => settings[:provider],
}
if settings[:http_port] != 80
diff --git a/puppet/hiera.yaml b/puppet/hiera.yaml
index f04bcad..a4d23aa 100644
--- a/puppet/hiera.yaml
+++ b/puppet/hiera.yaml
@@ -7,6 +7,6 @@
- local
- vagrant-managed
- "environment/%{::environment}"
- - "provider/%{::provider}"
+ - "provider/%{::provider_name}"
- common
:logger: console
--
To view, visit https://gerrit.wikimedia.org/r/232539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaebf718fc4bf57006507334805f81681ea207e97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
