smart_proxy_ansible_director 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af43997825b3a375df521d91325f82ef6947aac2bd6f9419dcb19403f53887c9
-  data.tar.gz: afa26d2ac945faf41d6d8322ebb569459274be4168426ad085b55524db8b4b71
+  metadata.gz: 484417416974c62a817f560959aa0fcd95d5b5160d4481c5f22e3f4c449b71b3
+  data.tar.gz: 83dacaf8b923d9a63c6299854ab2b35c9d130b1e56df9bfde30c3fd8c26c7492
 SHA512:
-  metadata.gz: 57d201d4b18cb63d45165a0d375c8fc9983533cd4fd88a86849ebdc82e2377faebe83044dfc47be6c651f3bff25d82d056c6a702f0c15b53752b1c398e24957d
-  data.tar.gz: f2ed84b40d72df8505a74299a2f7a0f604c6f9cac89c7db417ba45d1c017474298a623352493767cb5a6ebce65b4cfeb0a494ebbd805219ecb14a2b424cded07
+  metadata.gz: 607b9d6729dd2c702753262a7c5f15db1322e5b8affcd8dade3fe4f71548bc82409be0218b79ae56659ebdc4ecbfed80871d3e5b8f013703bbd73dcd4df81686
+  data.tar.gz: 3b09d2453eed3b24c4a93bf0ee5e7c46417d8e7b2e6d61e13d6499996c6491019d5127cf3e718cbff520f6a160b967013a22d54c5de81fe25fe2e54a4abd9068

data/lib/smart_proxy_ansible_director/actions/meta/build_push_ee.rb

@@ -27,9 +27,11 @@ module Proxy
           #             }
           #           }
           def plan(args)
-            execution_environment = args['execution_environment']
-            ee_id = execution_environment['id']
-            execution_environment_content = execution_environment['content']
+            execution_environment_definition = args['execution_environment']
+
+            ee_id = execution_environment_definition['id']
+            execution_environment_content = execution_environment_definition['content']
+
             ee_base_image = execution_environment_content['base_image']
             ee_base_image_tag = 'latest'
             ee_ansible_core_version = execution_environment_content['ansible_core_version']
@@ -40,15 +42,18 @@ module Proxy
             sequence do
               plan_action ::Proxy::AnsibleDirector::Actions::BuildExecutionEnvironment, {
                 ee_id: ee_id,
-                ee_base_image: ee_base_image,
-                ee_base_image_tag: ee_base_image_tag,
+                ee_base_image_url: ee_base_image,
+                ee_built_image_tag: ee_base_image_tag,
                 ee_ansible_core_version: ee_ansible_core_version,
                 ee_formatted_content: ee_formatted_content,
                 is_base_image: true
               }
-              plan_action ::Proxy::AnsibleDirector::Actions::PushExecutionEnvironment, {
-                ee_id: ee_id
-              }
+              # COMPAT 3.16 - 3
+              # Registry authorization has not been finalized.
+              # Further, granular capability usage is difficult with the current execution stack.
+              # plan_action ::Proxy::AnsibleDirector::Actions::PushExecutionEnvironment, {
+              #  ee_id: ee_id
+              # }
             end
           end
         end

data/lib/smart_proxy_ansible_director/actions/meta/run_playbook.rb

@@ -12,6 +12,12 @@ module Proxy
         class RunPlaybook < ::Proxy::Dynflow::Action::Runner
           def plan(args)
             execution_environment = args['execution_environment']
+
+            ee_id = execution_environment['id']
+            ee_registry_url = execution_environment['registry_url']
+            ee_ansible_core_version = execution_environment['ansible_core_version']
+
+
             inventory = args['inventory']
             playbook = args['playbook']
             variables = args['variables']
@@ -21,10 +27,10 @@ module Proxy
 
             sequence do
               plan_action ::Proxy::AnsibleDirector::Actions::BuildExecutionEnvironment, {
-                ee_id: execution_environment.split('/')[-1],
-                ee_base_image: execution_environment,
-                ee_base_image_tag: @caller_execution_plan_id,
-                ee_ansible_core_version: '2.19.0', # TODO: Get from EE
+                ee_id: ee_id,
+                ee_base_image_url: ee_registry_url,
+                ee_built_image_tag: @caller_execution_plan_id,
+                ee_ansible_core_version: ee_ansible_core_version,
                 ee_formatted_content: content,
                 is_base_image: false
               }
@@ -32,7 +38,7 @@ module Proxy
                 inventory: inventory,
                 playbook: playbook,
                 variables: variables,
-                execution_environment: "#{execution_environment.split('/')[-1]}:#{@caller_execution_plan_id}"
+                execution_environment: ee_registry_url.sub!("latest", @caller_execution_plan_id)
               }
               plan_action ::Proxy::Dynflow::Callback::Action,
                           args[:callback],

data/lib/smart_proxy_ansible_director/http_config.ru

@@ -2,6 +2,6 @@
 
 require 'smart_proxy_ansible_director/api'
 
-map '/ansible' do
+map '/ansible-director' do
   run Proxy::AnsibleDirector::Api
 end

data/lib/smart_proxy_ansible_director/plugin.rb

@@ -8,6 +8,12 @@ module Proxy
       plugin :ansible_director, ::Proxy::AnsibleDirector::VERSION
       rackup_path File.expand_path('http_config.ru', __dir__)
 
+      default_settings(
+        ansible_navigator_run_dir: "/usr/share/foreman-proxy/.ansible_director/run",
+        execution_env_build_dir: "/usr/share/foreman-proxy/.ansible_director/execution_env",
+        remove_workdirs: true
+      )
+
       load_classes do
         require 'smart_proxy_dynflow'
         require 'smart_proxy_ansible_director/launchers'

data/lib/smart_proxy_ansible_director/runners/ansible_builder_runner.rb

@@ -16,12 +16,18 @@ module Proxy
         #   ee_formatted_content: ee_formatted_content
         # }
         def initialize(ansible_builder_input, suspended_action: nil)
+          # ID of the execution environment definition; supplied by Foreman
           @ee_id = ansible_builder_input[:ee_id]
-          @ee_base_image = ansible_builder_input[:ee_base_image]
-          @ee_base_image_tag = ansible_builder_input[:ee_base_image_tag]
+          # TAGGED registry URL of the base image; supplied by Foreman
+          @ee_base_image_url = ansible_builder_input[:ee_base_image_url]
+          # Tag used at the end of building for this image
+          @ee_built_image_tag = ansible_builder_input[:ee_built_image_tag]
           @ee_ansible_core_version = ansible_builder_input[:ee_ansible_core_version]
           @ee_formatted_content = ansible_builder_input[:ee_formatted_content]
           @is_base_image = ansible_builder_input[:is_base_image]
+
+          workdir_base = Proxy::AnsibleDirector::Plugin.settings[:execution_env_build_dir]
+          @runner_workdir = Dir.mktmpdir('execution_env', workdir_base)
           super suspended_action: suspended_action
         end
 
@@ -44,7 +50,7 @@ module Proxy
             'version' => 3,
             'images' => {
               'base_image' => {
-                'name' => 'localhost/ansibleng/1:latest'
+                'name' => @ee_base_image_url
               }
             },
             'dependencies' => {
@@ -87,15 +93,17 @@ module Proxy
             build_args_str += "--build-arg #{k}=\"#{v}\" "
           end
 
+          # COMPAT 3.16 - 2
+          # --extra-build-cli-args is not supported in ansible-builder 3.0.0
+          # Verbosity is chosen by passing -v {0, 1, 2, 3}
+
           cmd = <<~CMD
-            TMPDIR=$(mktemp -d /tmp/execution-environment_ctx_XXXXXX)
-            echo $TMPDIR
-            cd $TMPDIR
+            echo "Running in #{@runner_workdir}"
 
-            cat <<EOF > "execution-environment.yml"
+            cat <<EOF > "#{@runner_workdir}/execution-environment.yml"
             #{YAML.dump(ee_definition, indentation: 2)}
             EOF
-            ansible-builder build --tag ansibleng/#{@ee_id}:#{@ee_base_image_tag} -vvv --extra-build-cli-args='--tls-verify=false' --file execution-environment.yml #{build_args_str}
+            ansible-builder build --tag ansible_director/#{@ee_id}:#{@ee_built_image_tag} -v 3 --file #{@runner_workdir}/execution-environment.yml #{build_args_str} --context #{@runner_workdir}
           CMD
 
           initialize_command('bash', '-c', cmd)
@@ -106,6 +114,15 @@ module Proxy
           puts @continuous_output.raw_outputs
           publish_exit_status(@process_manager.status) if @process_manager.done?
         end
+
+        def close
+          remove_workdirs = Proxy::AnsibleDirector::Plugin.settings[:remove_workdirs]
+          FileUtils.rm_rf @runner_workdir if remove_workdirs
+        end
+
+        def publish_data(message, type = 'debug')
+            @continuous_output.add_output(message.force_encoding('UTF-8'), type)
+        end
       end
     end
   end

data/lib/smart_proxy_ansible_director/runners/ansible_navigator_runner.rb

@@ -21,64 +21,66 @@ module Proxy
             @variables = ansible_input[:variables]
           end
           @execution_environment = ansible_input[:execution_environment]
+
+          workdir_base = Proxy::AnsibleDirector::Plugin.settings[:ansible_navigator_run_dir]
+          @runner_workdir = Dir.mktmpdir('navigator', workdir_base)
         end
 
         def start
           # TODO: Find a way to request the auth token programmatically
           cmd = <<~CMD
+            echo "Running in #{@runner_workdir}"
 
-            TMPDIR=$(mktemp -d /tmp/ansible-run_XXXXXX)
-            echo $TMPDIR
-            cd $TMPDIR#{'       '}
-
-            cat > "playbook.yaml" <<'EOF'
+            cat > "#{@runner_workdir}/playbook.yaml" <<'EOF'
             #{@playbook}
             EOF
 
-            cat > "inventory.yaml" <<'EOF'
+            cat > "#{@runner_workdir}/inventory.yaml" <<'EOF'
             #{@inventory}
             EOF
 
-            mkdir vars
+            mkdir #{@runner_workdir}/vars
 
             #{
               @variables.map do |role_name, variables|
-                %(cat > "vars/#{role_name}_vars.yaml" <<'EOF'\n#{format_variables role_name, variables}EOF)
+                %(cat > "#{@runner_workdir}/vars/#{role_name}_vars.yaml" <<'EOF'\n#{format_variables role_name, variables}EOF)
               end.join("\n\n")
             }
 
-              cat > "ansible-navigator.yaml" <<'EOF'
-              ---
-              ansible-navigator:
-                ansible:
-                  inventory:
-                    entries:
-                      - ./inventory.yaml
-                  playbook:
-                    path: ./playbook.yaml
-                execution-environment:
-                  image: #{@execution_environment}
-                  pull:
-                    arguments:
-                      - "--tls-verify=false"
-                      - "--authfile=$AUTHFILE"
-                    policy: missing
-                  volume-mounts:
-                    - src: #{File.join(Dir.pwd, Proxy::SETTINGS.foreman_ssl_cert)}
-                      dest: /run/secrets/foreman_ssl_cert
-                      options: Z,ro
-                    - src: #{File.join(Dir.pwd, Proxy::SETTINGS.foreman_ssl_key)}
-                      dest: /run/secrets/foreman_ssl_key
-                      options: Z,ro
-                    - src: #{File.join(Dir.pwd, Proxy::SETTINGS.foreman_ssl_ca)}
-                      dest: /run/secrets/foreman_ssl_verify
-                      options: Z,ro
-                logging:
-                  level: debug
-                mode: stdout
-              EOF
-
-            ansible-navigator run --mode stdout
+            cat > "#{@runner_workdir}/ansible-navigator.yml" <<'EOF'
+            ---
+            ansible-navigator:
+              ansible:
+                inventory:
+                  entries:
+                    - #{@runner_workdir}/inventory.yaml
+                playbook:
+                  path: #{@runner_workdir}/playbook.yaml
+              ansible-runner:
+                artifact-dir: #{@runner_workdir}
+              execution-environment:
+                image: #{@execution_environment}
+                pull:
+                  arguments:
+                    - "--tls-verify=false"
+                    - "--authfile=$AUTHFILE"
+                  policy: missing
+                volume-mounts:
+                  - src: #{File.join(Dir.pwd, Proxy::SETTINGS.foreman_ssl_cert)}
+                    dest: /run/secrets/foreman_ssl_cert
+                    options: Z,ro
+                  - src: #{File.join(Dir.pwd, Proxy::SETTINGS.foreman_ssl_key)}
+                    dest: /run/secrets/foreman_ssl_key
+                    options: Z,ro
+                  - src: #{File.join(Dir.pwd, Proxy::SETTINGS.foreman_ssl_ca)}
+                    dest: /run/secrets/foreman_ssl_verify
+                    options: Z,ro
+              logging:
+                level: debug
+              mode: stdout
+            EOF
+
+            ANSIBLE_NAVIGATOR_CONFIG=#{@runner_workdir}/ansible-navigator.yml ansible-navigator run --mode stdout
           CMD
           initialize_command('bash', '-c', cmd)
         end
@@ -89,6 +91,15 @@ module Proxy
           publish_exit_status(@process_manager.status) if @process_manager.done?
         end
 
+        def publish_data(message, type = 'debug')
+            @continuous_output.add_output(message.force_encoding('UTF-8'), type)
+        end
+
+        def close
+          remove_workdirs = Proxy::AnsibleDirector::Plugin.settings[:remove_workdirs]
+          FileUtils.rm_rf @runner_workdir if remove_workdirs
+        end
+
         private
 
         def format_variables(_role_name, variables)

data/lib/smart_proxy_ansible_director/runners/podman_pull_runner.rb

@@ -26,6 +26,10 @@ module Proxy
           puts @continuous_output.humanize
           publish_exit_status(@process_manager.status) if @process_manager.done?
         end
+
+        def publish_data(message, type = 'debug')
+            @continuous_output.add_output(message.force_encoding('UTF-8'), type)
+        end
       end
     end
   end

data/lib/smart_proxy_ansible_director/runners/podman_push_runner.rb

@@ -18,7 +18,7 @@ module Proxy
         def start
           # TODO: Parametrize
 
-          image_name = "ansibleng/#{@ee_id}:latest"
+          image_name = "ansible_director/#{@ee_id}:latest"
           registry = 'centos9-katello-devel-stable.example.com:4321'
 
           cmd = <<~CMD
@@ -32,6 +32,10 @@ module Proxy
           puts @continuous_output.humanize
           publish_exit_status(@process_manager.status) if @process_manager.done?
         end
+
+        def publish_data(message, type = 'debug')
+            @continuous_output.add_output(message.force_encoding('UTF-8'), type)
+        end
       end
     end
   end

data/lib/smart_proxy_ansible_director/version.rb

@@ -2,6 +2,6 @@
 
 module Proxy
   module AnsibleDirector
-    VERSION = '0.2.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible_director
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - ATIX AG
 bindir: bin
 cert_chain: []
-date: 2026-02-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_proxy_dynflow
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Smart Proxy plugin to integrate Ansible Director with Foreman
 test_files: []