F OpenNebula#3237: reverse order

al3xhh · Apr 6, 2020 · 44c7761 · 44c7761
1 parent 1e562dd
commit 44c7761
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/oneprovision/lib/utils.rb b/src/oneprovision/lib/utils.rb
@@ -220,7 +220,9 @@ def read_config(name)
                 end
 
                 if yaml['extends']
-                    yaml['extends'].each do |f|
+                    yaml['extends'] = [yaml['extends']].flatten
+
+                    yaml['extends'].reverse.each do |f|
                         base = read_config(f)
 
                         yaml.delete('extends')
@@ -247,7 +249,7 @@ def read_config(name)
                             base['defaults'][section].merge!(defaults)
                         end
 
-                        yaml.merge!(base)
+                        yaml = base
                     end
                 end