smart_proxy_ansible 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe91bd15ae06f9e9cc9e2d54fce101129acd7fd39f8f9c3d970909e5bf029545
-  data.tar.gz: d6e887989f068bfa795ceada359e68d911fbeba3d308d3eb0a52e35b1571c3fd
+  metadata.gz: debe537cdba96e4742fc5e0311bbb073f1b25248bd5dcf394d1368f7027d2db8
+  data.tar.gz: 6a889c1145db1a4958f0e571d5a792e84850aa33542ba072283e95e0aa56328d
 SHA512:
-  metadata.gz: dfc145591dd06dad090a054332802674e30f2c5b51ef22809b1dcd3a42e24f587cb4e577c9e41740ff691290fe4621610ba092c888f35eaba4fa3fa73a9f90dc
-  data.tar.gz: 53dfb48a0c82802307cb05df916a48d146bce2505148d8eb67162ef4f87bbeab626c02ecfed46e151051d12c6af1efea7c757ac50f24768654ff39933fa2b485
+  metadata.gz: 02c6d84ed28a87fc0a0f18c2b5d8360e614d4c698f71a34801917157145ca499359e2cb71121d6d6fb42141dcb52a3161c13ca5ea895c8d920be3998cce141ae
+  data.tar.gz: ee31bc6ba19ff2a6e3d348b6f11f9c3ac25212eeb77c6dad32556c49af254cec5320603a63c3c1dea28282561e1fc136e896f4a3f8b3b3db96ae001cc4cd50ae

data/bin/ansible-runner-environment.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -f "$SMART_PROXY_ANSIBLE_ENVIRONMENT_FILE" ] && source "$SMART_PROXY_ANSIBLE_ENVIRONMENT_FILE"
+exec "$@"

data/lib/smart_proxy_ansible/plugin.rb

@@ -5,7 +5,8 @@ module Proxy
       rackup_path File.expand_path('http_config.ru', __dir__)
       settings_file 'ansible.yml'
       plugin :ansible, Proxy::Ansible::VERSION
-      default_settings :ansible_dir => Dir.home
+      default_settings :ansible_dir => Dir.home,
+                       :ansible_environment_file => '/etc/foreman-proxy/ansible.env'
                        # :working_dir => nil
 
       load_classes ::Proxy::Ansible::ConfigurationLoader

data/lib/smart_proxy_ansible/runner/ansible_runner.rb

@@ -10,6 +10,9 @@ module Proxy::Ansible
       include ::Proxy::Dynflow::Runner::ProcessManagerCommand
       attr_reader :execution_timeout_interval
 
+      # To make this overridable in development
+      ENVIRONMENT_WRAPPER = ENV['SMART_PROXY_ANSIBLE_ENVIRONMENT_WRAPPER'] || '/usr/libexec/foreman-proxy/ansible-runner-environment'
+
       def initialize(input, suspended_action:, id: nil)
         super input, :suspended_action => suspended_action, :id => id
         @inventory = rebuild_secrets(rebuild_inventory(input), input)
@@ -65,6 +68,7 @@ module Proxy::Ansible
       def publish_exit_status(status)
         process_artifacts
         super
+        @targets.each_key { |host| publish_exit_status_for(host, status) } if status != 0
       end
 
       def initialize_command(*command)
@@ -98,7 +102,7 @@ module Proxy::Ansible
         logger.debug("[foreman_ansible] - parsing event file #{event_file}")
         begin
           event = JSON.parse(File.read(event_file))
-          if (hostname = event.dig('event_data', 'host'))
+          if (hostname = hostname_for_event(event))
             handle_host_event(hostname, event)
           else
             handle_broadcast_data(event)
@@ -110,6 +114,17 @@ module Proxy::Ansible
         end
       end
 
+      def hostname_for_event(event)
+        hostname = event.dig('event_data', 'host') || event.dig('event_data', 'remote_addr')
+        return nil if hostname.nil? || hostname.empty?
+
+        unless @targets.key?(hostname)
+          logger.warn("handle_host_event: unknown host #{hostname} for event '#{event['event']}', broadcasting")
+          return nil
+        end
+        hostname
+      end
+
       def handle_host_event(hostname, event)
         log_event("for host: #{hostname.inspect}", event)
         publish_data_for(hostname, event['stdout'] + "\n", 'stdout') if event['stdout']
@@ -175,10 +190,12 @@ module Proxy::Ansible
       def start_ansible_runner
         env = {}
         env['FOREMAN_CALLBACK_DISABLE'] = '1' if @rex_command
-        command = [env, 'ansible-runner', 'run', @root, '-p', 'playbook.yml']
+        env['SMART_PROXY_ANSIBLE_ENVIRONMENT_FILE'] = Proxy::Ansible::Plugin.settings[:ansible_environment_file]
+        command = ['ansible-runner', 'run', @root, '-p', 'playbook.yml']
         command << '--cmdline' << cmdline unless cmdline.nil?
         command << verbosity if verbose?
-        initialize_command(*command)
+
+        initialize_command(env, ENVIRONMENT_WRAPPER, *command)
         logger.debug("[foreman_ansible] - Running command '#{command.join(' ')}'")
       end
 

data/lib/smart_proxy_ansible/version.rb

@@ -2,6 +2,6 @@ module Proxy
   # Version, this allows the proxy and other plugins know
   # what version of the Ansible plugin is running
   module Ansible
-    VERSION = '3.4.0'
+    VERSION = '3.5.0'
   end
 end

data/settings.d/ansible.yml.example

@@ -1,3 +1,4 @@
 ---
 :enabled: true
 :working_dir: '~/.foreman-ansible'
+# :ansible_environment_file: /etc/foreman-proxy/ansible.env

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -149,6 +149,7 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
+- bin/ansible-runner-environment.sh
 - bin/json_inventory.sh
 - bundler.d/ansible.rb
 - lib/smart_proxy_ansible.rb
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: Smart-Proxy Ansible plugin