smart_proxy_acd 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 881bee215ecdb92ddd19b7b60397274f9e5eb72911660a289d235b5ab09aa8bc
-  data.tar.gz: 25abeb5af5ca858c7a18fbce66b4727a8bfe7d8b120089a7ecfd370792a75931
+  metadata.gz: 183250a25f2479402b6eb73acd841ec985da00ebe17cb4b836df7b1e3d37ae48
+  data.tar.gz: d9b0c52df1fad8c9a998930252617eb971a8319a3f53fdd0e910b17bcef8b439
 SHA512:
-  metadata.gz: 05a4fa40b1df875b7526b584b2ac5a2a544abd3d2248aa04dc31bc8b4592f094163929e6790d3abd826f5d7c9d0401a2add3476b5dc813aae027e5cd0354ffa1
-  data.tar.gz: ae1ad0260d9c7c95c3ae78be4bcc05e68a679ff6c3d453311598dcf2c51c4428c8e03056b2293ae4fcc85480566da7e48a5576e8473783f5816668b388d05f0c
+  metadata.gz: 88664606e79721dc883ee637bf749f54d6bfd3481ba42366abb4c0725a727fad4ec94d1029b25f0142b889b6bcdbde07f6e1142f419a939e8b3d4ae9ccddc5fa
+  data.tar.gz: 23cc133598f5d3888e0298bf5b2c3786d6a429ff6ba3625d673efdc0f61f338e64d749811c8dcbab8ff0cce544d7ec5672c813dbb38492cf2293f16d59c30f33

data/README.md

@@ -14,7 +14,6 @@ This plug-in adds support for [Application Centric Deployment](https://github.co
 
 We expect your proxy to also have
 [smart_proxy_dynflow](https://github.com/theforeman/smart_proxy_dynflow)
-and [foreman-tasks-core](https://github.com/theforeman/foreman-tasks) as
 a gem requirement.
 
 ### Get the code

data/lib/smart_proxy_acd/acd.rb

@@ -13,6 +13,8 @@ module Proxy
         require 'smart_proxy_acd/acd_task_launcher'
       end
 
+      default_settings :timeout => 60
+
       load_dependency_injection_wirings do |_container_instance, _settings|
         Proxy::Dynflow::TaskLauncherRegistry.register('acd', AcdTaskLauncher)
       end

data/lib/smart_proxy_acd/acd_main.rb

@@ -5,6 +5,17 @@ module Proxy
     extend ::Proxy::Log
 
     class << self
+      def plugin_settings
+        # rubocop:disable ClassVars
+        @@settings ||= OpenStruct.new(read_settings)
+        # rubocop:enable ClassVars
+      end
+
+      def read_settings
+        ::Proxy::Acd::Plugin.default_settings.merge(
+          YAML.load_file(File.join(::Proxy::SETTINGS.settings_directory, ::Proxy::Acd::Plugin.settings_file))
+        )
+      end
     end
   end
 end

data/lib/smart_proxy_acd/acd_runner.rb

@@ -1,8 +1,10 @@
+require 'smart_proxy_dynflow/runner/base'
 require 'smart_proxy_dynflow/runner/command_runner'
 require 'tempfile'
 require 'rest-client'
 require 'tmpdir'
 require 'socket'
+require 'proxy/request'
 
 # rubocop:disable ClassLength
 
@@ -12,42 +14,6 @@ module Proxy
     class AcdRunner < Proxy::Dynflow::Runner::CommandRunner
       DEFAULT_REFRESH_INTERVAL = 1
 
-      class << self
-        def parse_dynflow_settings(path)
-          return @dynflow_settings if defined? @dynflow_settings
-          if File.exist?(path)
-            @dynflow_settings = {}
-            YAML.load_file(path).each do |key, value|
-              @dynflow_settings[key.to_s] = value
-            end
-          end
-          @dynflow_settings
-        end
-
-        def parse_ssl_options
-          return @ssl_options if defined? @ssl_options
-
-          @ssl_options = {}
-          return @ssl_options unless URI.parse(@dynflow_settings['foreman_url']).scheme == 'https'
-
-          @ssl_options[:verify_ssl] = OpenSSL::SSL::VERIFY_PEER
-
-          private_key_file = @dynflow_settings['foreman_ssl_key'] || @dynflow_settings['ssl_private_key']
-          if private_key_file
-            private_key = File.read(private_key_file)
-            @ssl_options[:ssl_client_key] = OpenSSL::PKey::RSA.new(private_key)
-          end
-          certificate_file = @dynflow_settings['foreman_ssl_cert'] || @dynflow_settings['ssl_certificate']
-          if certificate_file
-            certificate = File.read(certificate_file)
-            @ssl_options[:ssl_client_cert] = OpenSSL::X509::Certificate.new(certificate)
-          end
-          ca_file = @dynflow_settings['foreman_ssl_ca'] || @dynflow_settings['ssl_ca_file']
-          @ssl_options[:ssl_ca_file] = ca_file if ca_file
-          @ssl_options
-        end
-      end
-
       def initialize(options, suspended_action:)
         super(options, :suspended_action => suspended_action)
         @options = options
@@ -55,19 +21,21 @@ module Proxy
 
       def get_playbook(playbook_id)
         logger.debug("Get playbook with id #{playbook_id}")
-        response = playbook_resource(playbook_id).get
+        response = playbook_resource(playbook_id)
         if response.code.to_s != '200'
           raise "Failed performing callback to Foreman server: #{response.code} #{response.body}"
         end
         tmp_file = Tempfile.new.path
-        File.write(tmp_file, response)
+        File.write(tmp_file, response.body)
         @playbook_tmp_base64_file = tmp_file
       end
 
       def playbook_resource(playbook_id)
-        dynflow_settings = self.class.parse_dynflow_settings('/etc/foreman-proxy/settings.yml')
-        playbook_url = dynflow_settings['foreman_url'] + "/acd/api/v2/ansible_playbooks/#{playbook_id}/grab"
-        @resource ||= RestClient::Resource.new(playbook_url, self.class.parse_ssl_options)
+        playbook_download_path = "/acd/api/v2/ansible_playbooks/#{playbook_id}/grab"
+        foreman_request = Proxy::HttpRequest::ForemanRequest.new
+        req = foreman_request.request_factory.create_get(playbook_download_path)
+        foreman_request.http.read_timeout = Proxy::Acd::Plugin.settings.timeout
+        foreman_request.send_request(req)
       end
 
       def store_playbook
@@ -133,6 +101,12 @@ module Proxy
         complete_inventory = YAML.safe_load(@acd_job['inventory'])
         my_inventory = complete_inventory[proxy_hostname]
 
+        my_inventory['all']['children'].each_value do |group|
+          group['hosts'].each_value do |host_vars|
+            host_vars['ansible_ssh_private_key_file'] ||= Proxy::RemoteExecution::Ssh::Plugin.settings[:ssh_identity_key_file]
+          end
+        end
+
         tmp_inventory_file = Tempfile.new('acd_inventory')
         tmp_inventory_file << my_inventory.to_yaml
         tmp_inventory_file << "\n"

data/lib/smart_proxy_acd/acd_task_launcher.rb

@@ -1,3 +1,5 @@
+require 'smart_proxy_dynflow/task_launcher'
+
 module Proxy
   module Acd
     # Implements the TaskLauncher::Batch for Acd

data/lib/smart_proxy_acd/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Acd
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/settings.d/acd.yml.example

@@ -1,2 +1,4 @@
 ---
 :enabled: true
+# The time we wait till the request to download the ansible playbook should be answered by the Foreman, in seconds.
+:timeout: 60

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_acd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Markus Bucher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop