lib/beaker-hostgenerator/util.rb in beaker-hostgenerator-1.4.0 vs lib/beaker-hostgenerator/util.rb in beaker-hostgenerator-1.5.0
- old
+ new
@@ -1,9 +1,9 @@
require 'beaker-hostgenerator/data'
require 'beaker-hostgenerator/roles'
require 'beaker-hostgenerator/hypervisor/vmpooler'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
module BeakerHostGenerator
module Utils
module_function
@@ -16,11 +16,11 @@
end
def dump_hosts(hosts, path)
vmpooler_hypervisor = BeakerHostGenerator::Hypervisor::Vmpooler.new
config = {}
- config.deep_merge! BeakerHostGenerator::Data.BASE_CONFIG
- config['CONFIG'].deep_merge! vmpooler_hypervisor.global_config()
+ config.deeper_merge! BeakerHostGenerator::Data.BASE_CONFIG
+ config['CONFIG'].deeper_merge! vmpooler_hypervisor.global_config()
hosts.each do |host|
config['HOSTS'][host.node_name] = {
'roles' => host['roles'],
'hypervisor' => "#{host['hypervisor']}",