smart_proxy_ansible 3.4.1 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e690f2c224c01d97752317ca99ae54ac84a01f45fc2d613c727477d0acbcdcf
-  data.tar.gz: 0ec2124072f46f08a9820dee2311dce4a72c44980701ed3ab12697788be1e2ca
+  metadata.gz: 8bf2021531a3d54fed65d1a3f9065d665e24d3d9868c648baac4a37b22bf2ebd
+  data.tar.gz: 0a8b69f873e29e44163cd8a69532741fa9852129a11494ea79f411f0d588c91a
 SHA512:
-  metadata.gz: 1b9e32a10bec5a241ea8e6d5aa9727f67e31b7cac1f47b6181ab14177942a48d722d23d54dc324a1fdfb19e0f57d442f80126a93e06331551700210628d8b7c8
-  data.tar.gz: 83f106b39297d92d521a2472db2c6c8c5a8d60b6391ea88b16a455e2d01070df6acb03ce2138474e8790a6d2495b897a1e118d4954af5115cba6f914a1e0de13
+  metadata.gz: b3d18efc8724bf3045f103b033ecdf3f30287a0ed7bfdef3e6f81a754a87491999e0a7e570b2ce7c33a318acc2ce71dbbb690bec574335adc102f2935efc1852
+  data.tar.gz: 0f94311f78476c38c79fb212b4e7c316294da2bef6073ef53ed31c6dc34eba724b0463938881dfda0fcfb02b0afa566c4aa6f65dd0927c7620ebf7a92b1cffaa

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/reader_helper.rb

@@ -25,9 +25,13 @@ module Proxy
             line =~ /^\s*#{config_key}/
           end
         rescue Errno::ENOENT, Errno::EACCES => e
-          RolesReader.logger.debug(e.backtrace)
-          message = "Could not read Ansible config file #{DEFAULT_CONFIG_FILE} - #{e.message}"
-          raise ReadConfigFileException.new(message), message
+          message = "Could not read Ansible config file #{DEFAULT_CONFIG_FILE}, using defaults - #{e.message}"
+          if e.is_a?(Errno::ENOENT)
+            RolesReader.logger.info(message)
+          else
+            RolesReader.logger.warn(message)
+          end
+          []
         end
 
         def playbook_or_role_full_name(path)

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)
@@ -187,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.1'
+    VERSION = '3.5.1'
   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.1
+  version: 3.5.1
 platform: ruby
 authors:
 - Ivan Nečas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2023-02-20 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.1.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Smart-Proxy Ansible plugin