smart_proxy_ansible_director 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11b4f80f48a4372c163be6a36eaac462054a9b8faeeecdf19bd8c1de4b3aae05
-  data.tar.gz: 0cc24d6656aacfebc1bc1be8a8b39e741faaf467f90b0a5055ba5a6589d6b8bb
+  metadata.gz: 8b4c354edd008b22c1a7c3bb81961c43c0159083c8605b06c04f7a1d85bd5c32
+  data.tar.gz: edf3d06edeef438c682173531b0ac2e29911803afc448c2bcca3f1f5b1517090
 SHA512:
-  metadata.gz: 710655ed3b2ee6b8b7c553da0ff6a3e358e99e2b103bd1655b992af6ebfc4b8d3a27e8aa0230c454ed77f3a73896a3f335d3645e680505d6e5bc14a848e1d87e
-  data.tar.gz: a37793192570e852c6587350dc6216b03bfe50934122e67a2fc8e871b6546f9134729e0d7097a9104ea538a4662b9c08fb50dec1c6a41c4cbb7b534284064653
+  metadata.gz: 7522c49d2d8ff5aac7499681d8321d1fdbe6f879df564da7a1cf5a53d04a20dd8ceddb1a7817e4ff65fe5e704039c75f16072e1cf460bd7d30a2af28f370cbb4
+  data.tar.gz: e41d6d20ccf4729d5550b6909b7bf5f4151171f2999684712a87db978dd7c27a1f2f5621efbe14659a7d02647599a2e52a41c8c4798982ef98d25fcd283fcdd3

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

@@ -3,6 +3,7 @@
 require_relative '../build_execution_environment'
 require_relative '../push_execution_environment'
 require_relative '../../helpers/execution_environment_helpers'
+require_relative '../../runners/meta_runner'
 require 'smart_proxy_dynflow/callback'
 
 module Proxy
@@ -10,40 +11,40 @@ module Proxy
     module Actions
       module Meta
         class RunPlaybook < ::Proxy::Dynflow::Action::Runner
-          def plan(args)
-            execution_environment = args['execution_environment']
+          def initiate_runner
+            execution_environment = input['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']
+            inventory = input['inventory']
+            playbook = input['playbook']
+            variables = input['variables'].to_hash
             content = ::Proxy::AnsibleDirector::Helpers::ExecutionEnvironmentHelpers.format_content(
-              args['content']
+              input['content']
             )
 
-            sequence do
-              plan_action ::Proxy::AnsibleDirector::Actions::BuildExecutionEnvironment, {
-                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
+            ::Proxy::AnsibleDirector::Runners::MetaRunner.new(
+              {
+                build_ee_input: {
+                  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
+                },
+                run_ansible_input: {
+                  inventory: inventory,
+                  playbook: playbook,
+                  variables: variables,
+                  execution_environment: ee_registry_url.sub("latest",
+                                                             @caller_execution_plan_id)
+                }
               }
-              run_ansible_action = plan_action ::Proxy::AnsibleDirector::Actions::RunAnsibleNavigator, {
-                inventory: inventory,
-                playbook: playbook,
-                variables: variables,
-                execution_environment: ee_registry_url.sub!("latest", @caller_execution_plan_id)
-              }
-              plan_action ::Proxy::Dynflow::Callback::Action,
-                          args[:callback],
-                          run_ansible_action.output
-            end
+            )
           end
         end
       end

data/lib/smart_proxy_ansible_director/helpers/execution_environment_helpers.rb

@@ -11,9 +11,9 @@ module Proxy
 
             content_units.each do |content_unit|
               formatted_unit = {
-                name: content_unit['identifier'],
-                version: content_unit['version'],
-                source: content_unit['source']
+                'name' => content_unit['identifier'],
+                'version' => content_unit['version'],
+                'source' => content_unit['source']
               }
 
               case content_unit['type']
@@ -24,8 +24,8 @@ module Proxy
               end
             end
             {
-              collections: collections.length.positive? ? collections : nil,
-              roles: roles.length.positive? ? roles : nil
+              'collections' => collections.length.positive? ? collections : nil,
+              'roles' => roles.length.positive? ? roles : nil
             }.compact!
           end
 

data/lib/smart_proxy_ansible_director/runners/ansible_builder_runner.rb

@@ -8,6 +8,8 @@ module Proxy
       class AnsibleBuilderRunner < ::Proxy::Dynflow::Runner::Base
         include ::Proxy::Dynflow::Runner::ProcessManagerCommand
 
+        attr_reader :continuous_output, :exit_status
+
         # ansible_builder_input
         # {
         #   ee_id: ee_id,
@@ -33,6 +35,15 @@ module Proxy
 
         def start
           ee_content = @ee_formatted_content.to_hash
+          ee_content.transform_values! do |value|
+              value.map do |cuv|
+                {
+                  'name' => cuv['name'],
+                  'source' => cuv['source'],
+                  'version' => cuv['version']
+                }.compact
+              end
+          end
 
           if @is_base_image
             ee_content.merge!(

data/lib/smart_proxy_ansible_director/runners/ansible_navigator_runner.rb

@@ -10,6 +10,8 @@ module Proxy
       class AnsibleNavigatorRunner < ::Proxy::Dynflow::Runner::Base
         include ::Proxy::Dynflow::Runner::ProcessManagerCommand
 
+        attr_reader :continuous_output, :exit_status
+
         def initialize(ansible_input, suspended_action: nil)
           super suspended_action: suspended_action
           @inventory = ::Proxy::AnsibleDirector::Helpers::AnsibleNavigatorHelpers.reserialize_inventory(ansible_input[:inventory])
@@ -28,6 +30,8 @@ module Proxy
 
         def start
           # TODO: Find a way to request the auth token programmatically
+          proxy_ssh_key_path = ::Proxy::RemoteExecution::Ssh::Plugin.settings[:ssh_identity_key_file]
+          proxy_ssh_key_mount_path = "/runner/.ssh/#{File.basename(proxy_ssh_key_path)}"
           cmd = <<~CMD
             echo "Running in #{@runner_workdir}"
 
@@ -72,8 +76,8 @@ module Proxy
                     dest: /run/secrets/foreman_ssl_key
                   - src: #{File.join(Dir.pwd, Proxy::SETTINGS.foreman_ssl_ca)}
                     dest: /run/secrets/foreman_ssl_verify
-                  - src: /usr/share/foreman-proxy/.ssh/id_rsa_foreman_proxy
-                    dest: /runner/.ssh/id_rsa_foreman_proxy
+                  - src: #{proxy_ssh_key_path}
+                    dest: #{proxy_ssh_key_mount_path}
               logging:
                 level: debug
                 file: #{@runner_workdir}/ansible-navigator.log
@@ -81,7 +85,7 @@ module Proxy
             EOF
 
             cd #{@runner_workdir}/
-            ansible-navigator run --mode stdout
+            ansible-navigator run --private-key=#{proxy_ssh_key_mount_path}
           CMD
           initialize_command('bash', '-c', cmd)
         end

data/lib/smart_proxy_ansible_director/runners/meta_runner.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require_relative '../runners'
+
+module Proxy
+  module AnsibleDirector
+    module Runners
+      class MetaRunner < ::Proxy::Dynflow::Runner::Base
+        PHASES = [
+          { id: :build_ee, title: 'Building execution environment', runner_class: AnsibleBuilderRunner,
+            runner_input_key: :build_ee_input },
+          { id: :run_ansible, title: 'Running Ansible', runner_class: AnsibleNavigatorRunner,
+            runner_input_key: :run_ansible_input }
+        ].freeze
+
+        def initialize(input, suspended_action: nil)
+          super(suspended_action: suspended_action)
+          @input = input
+          @phase_index = 0
+          @current_runner = nil
+        end
+
+        def start
+          transition_to_phase(@phase_index)
+        end
+
+        def refresh
+          return unless @current_runner
+
+          @current_runner.refresh
+
+          @continuous_output.raw_outputs.concat(@current_runner.continuous_output.raw_outputs)
+          @current_runner.continuous_output.raw_outputs.clear
+
+          return unless @current_runner.exit_status
+
+          if @current_runner.exit_status != 0
+            publish_exit_status(@current_runner.exit_status)
+          else
+            transition_to_next_phase
+          end
+        end
+
+        def kill
+          @current_runner&.kill
+        end
+
+        def close
+          @current_runner&.close
+        end
+
+        private
+
+        def transition_to_phase(index)
+          phase_info = PHASES[index]
+
+          @phase_index = index
+          runner_class = phase_info[:runner_class]
+          runner_input = @input[phase_info[:runner_input_key]]
+
+          @continuous_output.add_output(
+            "START: Phase #{phase_info[:id]} (#{index + 1} / #{PHASES.length}): #{phase_info[:title]}\n"
+          )
+
+          @current_runner = runner_class.new(runner_input, suspended_action: @suspended_action)
+          @current_runner.start
+        end
+
+        def transition_to_next_phase
+          phase_info = PHASES[@phase_index]
+          @continuous_output.add_output(
+            "END: Phase #{phase_info[:id]}: #{phase_info[:title]}\n"
+          )
+
+          if @phase_index + 1 < PHASES.length
+            @phase_index += 1
+            transition_to_phase(@phase_index)
+          else
+            publish_exit_status(0)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smart_proxy_ansible_director/version.rb

@@ -2,6 +2,6 @@
 
 module Proxy
   module AnsibleDirector
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible_director
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - ATIX AG
@@ -29,6 +29,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: smart_proxy_remote_execution_ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +123,7 @@ files:
 - lib/smart_proxy_ansible_director/runners.rb
 - lib/smart_proxy_ansible_director/runners/ansible_builder_runner.rb
 - lib/smart_proxy_ansible_director/runners/ansible_navigator_runner.rb
+- lib/smart_proxy_ansible_director/runners/meta_runner.rb
 - lib/smart_proxy_ansible_director/runners/podman_pull_runner.rb
 - lib/smart_proxy_ansible_director/runners/podman_push_runner.rb
 - lib/smart_proxy_ansible_director/version.rb
@@ -128,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Smart Proxy plugin to integrate Ansible Director with Foreman
 test_files: []