forked from dev-sec/ansible-collection-hardening
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request dev-sec#100 from fullyint/missing-vagrant-plugins
Accommodate missing plugins in kitchen_vagrant_block.rb
- Loading branch information
Showing
2 changed files
with
9 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,19 @@ | ||
# This is a Vagrant block to allow proxy settings to be carried into Kitchen | ||
# You need this for all of yum/apt etc. to work! | ||
unless ENV['http_proxy'].empty? || Vagrant.has_plugin?("vagrant-proxyconf") | ||
unless ENV['http_proxy'].nil? || Vagrant.has_plugin?("vagrant-proxyconf") | ||
raise "Missing required plugin 'vagrant-proxyconf' to support HTTP(S) proxies, run `vagrant plugin install vagrant-proxyconf`" | ||
end | ||
|
||
Vagrant.configure(2) do |config| | ||
config.proxy.http = "#{ENV['http_proxy']}" | ||
config.proxy.https = "#{ENV['https_proxy']}" | ||
config.proxy.no_proxy = "localhost,127.0.0.1" | ||
if Vagrant.has_plugin?("vagrant-proxyconf") | ||
config.proxy.http = "#{ENV['http_proxy']}" | ||
config.proxy.https = "#{ENV['https_proxy']}" | ||
config.proxy.no_proxy = "localhost,127.0.0.1" | ||
end | ||
|
||
# You may have vagrant-vbguest plugin installed to keep your images up to date | ||
# - but will probably have VBoxAddition build issues with the foreign boxes listed in .kitchen.vagrant.yml | ||
config.vbguest.auto_update = false | ||
if Vagrant.has_plugin?("vagrant-vbguest") | ||
config.vbguest.auto_update = false | ||
end | ||
end |