Commit dcbacf46d8ac6caad961c1f833b27cb24b5498d0

Authored by Sergio Oliveira
1 parent b397763e
Exists in master and in 89 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, 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
Vagrantfile
... ... @@ -24,30 +24,30 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
24 24 end
25 25  
26 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 29 end
30 30 end
31 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 34 vm.memory = 1024
35 35 vm.cpus = 2
36 36 end
37 37 end
38 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 41 end
42 42 end
43 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 46 end
47 47 end
48 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 51 end
52 52 if File.exist?("tmp/preconfig.#{env}.stamp")
53 53 reverseproxy.ssh.port = File.read("tmp/preconfig.#{env}.stamp").strip.to_i
... ...