Download as
Browse Code »

Commit dcbacf46d8ac6caad961c1f833b27cb24b5498d0

Authored by Sergio Oliveira
1 parent b397763e
Exists in master and in 64 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Override vm config is possible but should be done this way: 

http://docs.vagrantup.com/v2/providers/configuration.html
Showing 1 changed file with 10 additions and 10 deletions   Show diff stats
@@ -24,30 +24,30 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -24,30 +24,30 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
24 end 24 end
25 25
26 config.vm.define 'database' do |database| 26 config.vm.define 'database' do |database|
27 - database.vm.provider "virtualbox" do |vm|  
28 - database.vm.network 'private_network', ip: ips['database'] if ips 27 + database.vm.provider "virtualbox" do |vm, override|
  28 + override.vm.network 'private_network', ip: ips['database'] if ips
29 end 29 end
30 end 30 end
31 config.vm.define 'integration' do |integration| 31 config.vm.define 'integration' do |integration|
32 - integration.vm.provider "virtualbox" do |vm|  
33 - integration.vm.network 'private_network', ip: ips['integration'] if ips 32 + integration.vm.provider "virtualbox" do |vm, override|
  33 + override.vm.network 'private_network', ip: ips['integration'] if ips
34 vm.memory = 1024 34 vm.memory = 1024
35 vm.cpus = 2 35 vm.cpus = 2
36 end 36 end
37 end 37 end
38 config.vm.define 'email' do |email| 38 config.vm.define 'email' do |email|
39 - email.vm.provider "virtualbox" do |vm|  
40 - email.vm.network 'private_network', ip: ips['email'] if ips 39 + email.vm.provider "virtualbox" do |vm, override|
  40 + override.vm.network 'private_network', ip: ips['email'] if ips
41 end 41 end
42 end 42 end
43 config.vm.define 'social' do |social| 43 config.vm.define 'social' do |social|
44 - social.vm.provider "virtualbox" do |vm|  
45 - social.vm.network 'private_network', ip: ips['social'] if ips 44 + social.vm.provider "virtualbox" do |vm, override|
  45 + override.vm.network 'private_network', ip: ips['social'] if ips
46 end 46 end
47 end 47 end
48 config.vm.define 'reverseproxy' do |reverseproxy| 48 config.vm.define 'reverseproxy' do |reverseproxy|
49 - reverseproxy.vm.provider "virtualbox" do |vm|  
50 - reverseproxy.vm.network 'private_network', ip: ips['reverseproxy'] if ips 49 + reverseproxy.vm.provider "virtualbox" do |vm, override|
  50 + override.vm.network 'private_network', ip: ips['reverseproxy'] if ips
51 end 51 end
52 if File.exist?("tmp/preconfig.#{env}.stamp") 52 if File.exist?("tmp/preconfig.#{env}.stamp")
53 reverseproxy.ssh.port = File.read("tmp/preconfig.#{env}.stamp").strip.to_i 53 reverseproxy.ssh.port = File.read("tmp/preconfig.#{env}.stamp").strip.to_i