stackforge/puppet-openstack_dev_env
Code Issues Proposed changes

save merge of config overrides in vagrant

Browse Source 
Previously, the vagrant config file did not work
b/c its config was not being merged into the config
that is used.
This commit is contained in:
Dan Bode
2012-12-10 21:35:52 -08:00
parent 29606d6211
commit bd6a223cc6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@@ -5,7 +5,7 @@ def parse_vagrant_config(
config = {'gui_mode' => "false", 'operatingsystem' => 'ubuntu'} config = {'gui_mode' => "false", 'operatingsystem' => 'ubuntu'}
if File.exists?(config_file) if File.exists?(config_file)
overrides = YAML.load_file(config_file) overrides = YAML.load_file(config_file)
config.merge(overrides) config.merge!(overrides)
end end
config config
end end