[Vagrant] fix v2 config --- https://www.pld-linux.org/packages/lxc-docker?rev=1379325125 +++ https://www.pld-linux.org/packages/lxc-docker @@ -88,14 +88,8 @@ Vagrant::Config.run do |config| # Setup virtual machine box. This VM configuration code is always executed. config.vm.box = BOX_NAME config.vm.box_url = BOX_URI - - # ssh agent forwarding can be useful - #config.ssh.forward_agent = true - - # Make VM accessible outside VM itself, and use eth1 device - #config.vm.network :public_network, { bridge: 'eth1', auto_config: true } # Provision docker and new kernel if deployment was not done if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty? pkg_cmd = "set -xe; " @@ -137,7 +131,13 @@ Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config| config.vm.provider :virtualbox do |vb| config.vm.box = BOX_NAME config.vm.box_url = BOX_URI + + # ssh agent forwarding can be useful + #config.ssh.forward_agent = true + + # Make VM accessible outside VM itself, and use eth1 device + #config.vm.network :public_network, { bridge: 'eth1', auto_config: true } end end </code>
Diff URL: https://www.pld-linux.org/packages/lxc-docker?do=diff&r1=1379325125&r2=1379364532 -- This mail was generated by DokuWiki at https://www.pld-linux.org/ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
