From 37bcd7b6947f046f6112d8f856a5452a2b6200a5 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Thu, 19 Apr 2018 14:03:41 +0200
Subject: [PATCH] Add support for Foreman 1.17+
---
.../foreman_vmware_advanced/vmware_extensions.rb | 10 ++--------
lib/foreman_vmware_advanced/engine.rb | 2 +-
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb b/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb
index 2bef169..5c1cbb2 100644
--- a/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb
+++ b/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb
@@ -1,13 +1,7 @@
module ForemanVmwareAdvanced
module VmwareExtensions
- extend ActiveSupport::Concern
-
- included do
- alias_method_chain :parse_args, :vmware_advanced
- end
-
- def parse_args_with_vmware_advanced(inp_args)
- args = parse_args_without_vmware_advanced(inp_args)
+ def parse_args(inp_args)
+ args = super(inp_args)
args[:extra_config] = (args[:extra_config] || {}).merge(
'bios.bootOrder'.to_sym => 'ethernet0',
diff --git a/lib/foreman_vmware_advanced/engine.rb b/lib/foreman_vmware_advanced/engine.rb
index 2745c82..ce18b52 100644
--- a/lib/foreman_vmware_advanced/engine.rb
+++ b/lib/foreman_vmware_advanced/engine.rb
@@ -10,7 +10,7 @@ module ForemanVmwareAdvanced
config.to_prepare do
begin
- ::Foreman::Model::Vmware.send :include, ForemanVmwareAdvanced::VmwareExtensions
+ ::Foreman::Model::Vmware.send :prepend, ForemanVmwareAdvanced::VmwareExtensions
rescue => e
Rails.logger.warn "ForemanVmwareAdvanced: skipping engine hook(#{e})"
end
--
GitLab