B #-: Fix loading YAML with aliases (#3190)

OpenNebula · Aug 2, 2024 · 650fb59 · 650fb59
1 parent 015c735
commit 650fb59
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/onecfg/lib/patch/apply.rb b/src/onecfg/lib/patch/apply.rb
@@ -165,7 +165,11 @@ def apply(all = true)
         #
         # @param filename [String] path to patch in YAML format
         def parse_yaml(filename)
-            @patches = YAML.load_file(filename)
+            if Psych::VERSION > '4.0'
+                @patches = YAML.load_file(filename, :aliases => true)
+            else
+                @patches = YAML.load_file(filename)
+            end
 
             return if @patches.is_a?(Hash)
 

diff --git a/src/onecfg/lib/settings.rb b/src/onecfg/lib/settings.rb
@@ -42,7 +42,11 @@ def load
             reset
 
             if ::File.exist?(@name)
-                @content = YAML.load_file(@name)
+                if Psych::VERSION > '4.0'
+                    @content = YAML.load_file(@name, :alises => true)
+                else
+                    @content = YAML.load_file(@name)
+                end
             end
         rescue StandardError => e
             OneCfg::LOG.error("Can't load settings from '#{@name}' " \