Merge pull request #865 from jrafanie/psych4_support

Psych 4 support

app/models/manageiq/providers/openstack/cloud_manager/orchestration_template.rb

@@ -105,7 +105,7 @@ def self.display_name(number = 1)
 
   def parse
     return JSON.parse(content) if format == 'json'
-    YAML.safe_load(content, [Date])
+    YAML.safe_load(content, :permitted_classes => [Date])
   end
 
   def validate_format_yaml

app/models/manageiq/providers/openstack/helper_methods.rb

@@ -64,6 +64,11 @@ def parse_error_message_excon_http_status(exception)
     end
 
     def with_notification(type, options: {})
+      # We're explicitly serializing objects in the options subject key so we should permit yaml loading those classes
+      if options[:subject]
+        ActiveRecord::Base.yaml_column_permitted_classes = ActiveRecord::Base.yaml_column_permitted_classes | [options[:subject].class]
+      end
+
       # extract success and error options from options
       # :success and :error keys respectively
       # with all other keys common for both cases

spec/models/manageiq/providers/openstack/cloud_manager/provision/volume_attachment_spec.rb

@@ -5,6 +5,8 @@
     @flavor = FactoryBot.create(:flavor_openstack)
     @volume = FactoryBot.create(:cloud_volume_openstack)
 
+    # We're storing objects in the instance_type, so we must permit loading this class
+    ActiveRecord::Base.yaml_column_permitted_classes = ActiveRecord::Base.yaml_column_permitted_classes | [@flavor.class]
     @task = FactoryBot.create(:miq_provision_openstack,
                                :source  => @template,
                                :state   => 'pending',