openstack
/
devstack-vagrant
Code Issues Proposed changes

Merge "Use the vagrant-proxyconf plugin to allow the usage of a HTTP proxy"

This commit is contained in:
Jenkins 2014-10-30 18:50:52 +00:00 committed by Gerrit Code Review
parent 0bfa78e015 87407369ab
commit e6720b9f84
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Vagrantfile vendored
View File

@ -86,6 +86,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.cache.scope = :box
end
if Vagrant.has_plugin?("vagrant-proxyconf") && conf['proxy']
config.proxy.http = conf['proxy']
config.proxy.no_proxy = "localhost,127.0.0.1,#{hostname_manager},#{hostname_compute}"
end
# NOTE(berendt): This solves the Ubuntu-specific Vagrant issue 1673.
# https://github.com/mitchellh/vagrant/issues/1673
config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"

4
config.yaml.sample
View File

@ -26,6 +26,10 @@ bridge_int: eth1
# if you have code on a different branch than master, you can set it here
#devstack_branch: compute_err_exit
# You can specify a proxy, for example https://github.com/tmatilai/polipo-box,
# to be used for HTTP connections to speed things up.
#proxy: http://10.0.10.30:8123/
# Uncomment below to setup LDAP on the management node and use it as
# backend for keystone
#use_ldap: true