foreman_acd 0.5.0 → 0.6.0

data/app/controllers/foreman_acd/concerns/ansible_playbook_parameters.rb

@@ -9,7 +9,7 @@ module ForemanAcd
       class_methods do
         def ansible_playbook_params_filter
           Foreman::ParameterFilter.new(::ForemanAcd::AnsiblePlaybook).tap do |filter|
-            filter.permit(:name, :description, :scm_type, :path, :playfile)
+            filter.permit(:name, :description, :scm_type, :path, :playfile, :location_ids => [], :organization_ids => [])
           end
         end
       end

data/app/controllers/foreman_acd/concerns/app_definition_parameters.rb

@@ -9,7 +9,7 @@ module ForemanAcd
       class_methods do
         def app_definition_params_filter
           Foreman::ParameterFilter.new(::ForemanAcd::AppDefinition).tap do |filter|
-            filter.permit(:name, :description, :acd_ansible_playbook_id, :services, :ansible_vars_all)
+            filter.permit(:name, :description, :acd_ansible_playbook_id, :services, :ansible_vars_all, :location_ids => [], :organization_ids => [])
           end
         end
       end

data/app/controllers/foreman_acd/concerns/app_instance_parameters.rb

@@ -9,7 +9,7 @@ module ForemanAcd
       class_methods do
         def app_instance_params_filter
           Foreman::ParameterFilter.new(::ForemanAcd::AppInstance).tap do |filter|
-            filter.permit(:name, :app_definition_id, :description, :hosts, :ansible_vars_all)
+            filter.permit(:name, :app_definition_id, :description, :hosts, :ansible_vars_all, :organization_id, :location_id)
           end
         end
       end

data/app/controllers/foreman_acd/remote_execution_controller.rb

@@ -3,7 +3,6 @@
 module ForemanAcd
   # Class to run remote execution jobs
   class RemoteExecutionController < JobInvocationsController
-
     def new
       jobs = init_configuration
       @composer = jobs.first
@@ -18,9 +17,7 @@ module ForemanAcd
         @composer.trigger!
         redirect_to job_invocation_path(@composer.job_invocation)
       elsif customize_first == false
-        jobs.each do |composer|
-          composer.trigger
-        end
+        jobs.each(&:trigger)
         redirect_to job_invocations_path
       else
         # redirect to the job itself if we want to customize the job
@@ -38,12 +35,12 @@ module ForemanAcd
     private
 
     def init_configuration
-      app_instance = ForemanAcd::AppInstance.find_by(:name => params[:id])
+      app_instance = ForemanAcd::AppInstance.find_by(:id => params[:id])
       app_configurator = ForemanAcd::AppConfigurator.new(app_instance)
 
       jobs = app_configurator.configure
       logger.debug("Creating #{jobs.count} job(s) to configure the app #{app_instance}. Customize first: #{params[:customize]}")
-      return jobs
+      jobs
     end
   end
 end

data/app/controllers/ui_acd_controller.rb

@@ -16,6 +16,15 @@ class UiAcdController < ::Api::V2::BaseController
     @ansible_data = collect_ansible_data(params['id'])
   end
 
+  def action_permission
+    case params[:action]
+    when 'app', 'foreman_data', 'ansible_data'
+      :view
+    else
+      super
+    end
+  end
+
   private
 
   def collect_foreman_data(hostgroup_id)

data/app/lib/actions/foreman_acd/deploy_all_hosts.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Actions
+  module ForemanAcd
+    # DeployAllHosts implements a Foreman Task EntryAction
+    class DeployAllHosts < Actions::EntryAction
+      def plan(app_instance)
+        action_subject(app_instance)
+        plan_self(:id => app_instance.id)
+      end
+
+      def run
+        output[:status] = 'IN PROGRESS'
+        app_instance = ::ForemanAcd::AppInstance.find(input.fetch(:id))
+
+        # Goal: all or nothing
+        begin
+          ::Foreman::Logging.logger('foreman_acd').info "Start to deploy all hosts of the app #{app_instance}"
+          app_deployer = ::ForemanAcd::AppDeployer.new(app_instance)
+          output[:data] = app_deployer.deploy
+          output[:status] = 'SUCCESS'
+        rescue StandardError => e
+          ::Foreman::Logging.logger('foreman_acd').error "Error while deploying hosts for application instance. Clean up all other hosts: #{e}"
+          app_instance.clean_all_hosts
+
+          output[:error] = e.to_s
+          output[:status] = 'FAILURE'
+        end
+      end
+
+      def finalize; end
+
+      def rescue_strategy
+        Dynflow::Action::Rescue::Fail
+      end
+
+      def humanized_name
+        _('Deploy application instance hosts')
+      end
+    end
+  end
+end

data/app/lib/actions/foreman_acd/run_configurator.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Actions
+  module ForemanAcd
+    # RunConfigurator implements a Foreman Task EntryAction
+    class RunConfigurator < Actions::EntryAction
+      def plan(app_instance)
+        action_subject(app_instance)
+        plan_self(:id => app_instance.id)
+      end
+
+      def run
+        output[:status] = 'SUCCESS'
+        begin
+          app_instance = ::ForemanAcd::AppInstance.find(input.fetch(:id))
+          app_configurator = ::ForemanAcd::AppConfigurator.new(app_instance)
+
+          jobs = app_configurator.configure
+          ::Foreman::Logging.logger('foreman_acd').info "Creating #{jobs.count} job(s) to configure the app #{app_instance}"
+
+          # TODO: would it be better to create a sub task for each job we need to run?
+          jobs.each(&:trigger)
+        rescue StandardError => e
+          ::Foreman::Logging.logger('foreman_acd').error "Error while configuring application instance: #{e}"
+          output[:error] = e.to_s
+          output[:status] = 'FAILURE'
+        end
+      end
+
+      def finalize; end
+
+      def rescue_strategy
+        Dynflow::Action::Rescue::Fail
+      end
+
+      def humanized_name
+        _('Configure application instance after hosts deployment')
+      end
+    end
+  end
+end

data/app/models/concerns/foreman_acd/host_managed_extensions.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module ForemanAcd
+  # Extends the Host Managed
+  module HostManagedExtensions
+    extend ActiveSupport::Concern
+
+    RUN_CONFIGURATOR_DELAY = 240
+
+    def self.prepended(base)
+      base.instance_eval do
+        before_provision :initiate_acd_app_configurator, :if => :deployed_via_acd?
+      end
+    end
+
+    private
+
+    def deployed_via_acd?
+      find_app_instance_host
+      @app_instance_host.present?
+    end
+
+    def find_app_instance_host
+      @app_instance_host = ForemanAcd::ForemanHost.find_by(:host_id => id)
+    end
+
+    def initiate_acd_app_configurator
+      return false if @app_instance_host.blank?
+
+      run_it = true
+      @app_instance_host.app_instance.foreman_hosts.each do |foreman_host|
+        # if there is ONE host, which is still in build phase we don't let the app_configuator run
+        next unless foreman_host.host.build?
+        ::Foreman::Logging.logger('foreman_acd').info("Another host (#{foreman_host.host.name} is still in build-phase. Wait for it...")
+        run_it = false
+        break
+      end
+
+      return unless run_it
+
+      ::Foreman::Logging.logger('foreman_acd').info("All hosts of app (#{@app_instance_host.app_instance.name}) were built. Schedule app configurator...")
+      start_acd_app_configurator
+    end
+
+    def start_acd_app_configurator
+      ForemanTasks.delay(::Actions::ForemanAcd::RunConfigurator,
+                         { :start_at => Time.zone.now + RUN_CONFIGURATOR_DELAY },
+                         @app_instance_host.app_instance)
+    end
+  end
+end

data/app/models/foreman_acd/acd_provider.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module ForemanAcd
+  # Implement a RemoteExecutionProvider
   class AcdProvider < RemoteExecutionProvider
     class << self
       def supports_effective_user?

data/app/models/foreman_acd/ansible_playbook.rb

@@ -4,14 +4,35 @@ module ForemanAcd
   # Ansible playbook
   class AnsiblePlaybook < ApplicationRecord
     include Authorizable
+    include Taxonomix
     extend FriendlyId
     friendly_id :name
+    include Parameterizable::ByIdName
 
     self.table_name = 'acd_ansible_playbooks'
-    has_many :app_definitions, :inverse_of => :ansible_playbook, :foreign_key => 'acd_ansible_playbook_id', dependent: :restrict_with_error
+    has_many :app_definitions, :inverse_of => :ansible_playbook, :foreign_key => 'acd_ansible_playbook_id', :dependent => :restrict_with_error
     validates :name, :presence => true, :uniqueness => true
     scoped_search :on => :name
-    default_scope -> { order("acd_ansible_playbooks.name") }
+
+    default_scope do
+      with_taxonomy_scope do
+        order('acd_ansible_playbooks.name')
+      end
+    end
+
+    def used_location_ids
+      Location.joins(:taxable_taxonomies).where(
+        'taxable_taxonomies.taxable_type' => 'ForemanAcd::AnsiblePlaybook',
+        'taxable_taxonomies.taxable_id' => id
+      ).pluck("#{Taxonomy.table_name}.id")
+    end
+
+    def used_organization_ids
+      Organization.joins(:taxable_taxonomies).where(
+        'taxable_taxonomies.taxable_type' => 'ForemanAcd::AnsiblePlaybook',
+        'taxable_taxonomies.taxable_id' => id
+      ).pluck("#{Taxonomy.table_name}.id")
+    end
 
     def self.humanize_class_name(_name = nil)
       _('Ansible playbook')
@@ -31,20 +52,16 @@ module ForemanAcd
     end
 
     def as_unified_structobj
-      groups = []
-
-      JSON.load(self.vars).each do |group_name, vars|
-        groups << OpenStruct.new(
-          :name => group_name,
-          :vars => vars.map { |k,v| OpenStruct.new(:name => k, :value => v) })
+      # FIXME: For now, we convert all values to string - even booleans and dicts
+      pretty_groups = JSON.parse(vars).each do |_, params|
+        params.transform_values!(&:to_s)
       end
 
-      adata = OpenStruct.new(
-        :id => self.id,
-        :name => self.name,
-        :groups => JSON.load(self.vars)
+      OpenStruct.new(
+        :id => id,
+        :name => name,
+        :groups => pretty_groups
       )
-      adata
     end
   end
 end

data/app/models/foreman_acd/app_definition.rb

@@ -4,14 +4,37 @@ module ForemanAcd
   # Application Definition
   class AppDefinition < ApplicationRecord
     include Authorizable
+    include Taxonomix
     extend FriendlyId
     friendly_id :name
+    include Parameterizable::ByIdName
 
+    self.table_name = 'acd_app_definitions'
     validates :name, :presence => true, :uniqueness => true
+    validates :ansible_playbook, :presence => true
     has_many :app_instances, :inverse_of => :app_definition, :dependent => :destroy
     belongs_to :ansible_playbook, :inverse_of => :app_definitions, :foreign_key => :acd_ansible_playbook_id
     scoped_search :on => :name
-    default_scope -> { order("app_definitions.name") }
+
+    default_scope do
+      with_taxonomy_scope do
+        order('acd_app_definitions.name')
+      end
+    end
+
+    def used_location_ids
+      Location.joins(:taxable_taxonomies).where(
+        'taxable_taxonomies.taxable_type' => 'ForemanAcd::AppDefinition',
+        'taxable_taxonomies.taxable_id' => id
+      ).pluck("#{Taxonomy.table_name}.id")
+    end
+
+    def used_organization_ids
+      Organization.joins(:taxable_taxonomies).where(
+        'taxable_taxonomies.taxable_type' => 'ForemanAcd::AppDefinition',
+        'taxable_taxonomies.taxable_id' => id
+      ).pluck("#{Taxonomy.table_name}.id")
+    end
 
     def self.humanize_class_name(_name = nil)
       _('App Definition')

data/app/models/foreman_acd/app_instance.rb

@@ -4,12 +4,24 @@ module ForemanAcd
   # Application Instance
   class AppInstance < ApplicationRecord
     include Authorizable
+    include ForemanTasks::Concerns::ActionSubject
     extend FriendlyId
     friendly_id :name
+    include Parameterizable::ByIdName
+
+    self.table_name = 'acd_app_instances'
+    belongs_to :last_deploy_task, :class_name => 'ForemanTasks::Task'
     validates :name, :presence => true, :uniqueness => true
+    validates :app_definition, :presence => true
     belongs_to :app_definition, :inverse_of => :app_instances
+    belongs_to :organization
+    validates :organization, :presence => true
+    belongs_to :location
+    validates :location, :presence => true
+    has_many :foreman_hosts, :inverse_of => :app_instance, :dependent => :destroy
     scoped_search :on => :name
-    default_scope -> { order("app_instances.name") }
+    default_scope -> { order('acd_app_instances.name') }
+    attr_accessor :hosts
 
     def self.humanize_class_name(_name = nil)
       _('App Instance')
@@ -19,10 +31,33 @@ module ForemanAcd
       'app_instances'
     end
 
-    def foreman_hosts
-      app_hosts = JSON.parse(self.hosts)
-      host_ids = app_hosts.select{ |h| h&.key?('foreman_host_id') }.map{ |h| h['foreman_host_id'] }
-      ::Host.find(host_ids)
+    def clean_all_hosts
+      remember_host_ids = foreman_hosts.map(&:host_id)
+
+      # Clean the app instance association first
+      foreman_hosts.update_all(:host_id => nil)
+
+      # Remove all hosts afterwards
+      delete_hosts(remember_host_ids)
+    end
+
+    def clean_hosts_by_id(ids = [])
+      # Clean the app instance association first
+      foreman_hosts.where(:host_id => ids).update_all(:host_id => nil)
+
+      # Remove all hosts afterwards
+      delete_hosts(ids)
+    end
+
+    def delete_hosts(ids = [])
+      return if ids.empty?
+      ids.each do |host_id|
+        h = ::Host.find(host_id) unless host_id.nil?
+        if h
+          Katello::RegistrationManager.unregister_host(h, :unregistering => false) if ForemanAcd::Engine.with_katello?
+          h.destroy
+        end
+      end
     end
   end
 end

data/app/models/foreman_acd/foreman_host.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module ForemanAcd
+  # Foreman Host
+  class ForemanHost < ApplicationRecord
+    include Authorizable
+
+    self.table_name = 'acd_foreman_hosts'
+    validates :hostname, :presence => true
+    belongs_to :app_instance, :inverse_of => :foreman_hosts
+    belongs_to :host, :class_name => '::Host::Managed'
+    scoped_search :on => :hostname
+    default_scope -> { order('acd_foreman_hosts.hostname') }
+
+    def self.humanize_class_name(_name = nil)
+      _('Foreman Host')
+    end
+
+    def self.permission_name
+      'foreman_hosts'
+    end
+  end
+end

data/app/models/foreman_acd/taxonomy_extensions.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ForemanAcd
+  # This is a TaxonomyExtensions
+  module TaxonomyExtensions
+    extend ActiveSupport::Concern
+
+    included do
+      if SETTINGS[:version].to_s.to_f <= 1.7
+        def self.enabled_taxonomies
+          %w[locations organizations].select { |taxonomy| SETTINGS["#{taxonomy}_enabled".to_sym] }
+        end
+      end
+    end
+  end
+end
+# To be removed after 1.7 compatibility is no longer required

data/app/services/foreman_acd/app_configurator.rb

@@ -3,7 +3,6 @@
 module ForemanAcd
   # application instances configurator
   class AppConfigurator
-
     delegate :logger, :to => :Rails
 
     def initialize(app_instance)
@@ -25,20 +24,18 @@ module ForemanAcd
         hosts = @app_instance.foreman_hosts
         proxy_selector = RemoteExecutionProxySelector.new
         hosts.each do |h|
-          proxy = proxy_selector.determine_proxy(h, 'SSH')
-          unless proxy_hosts.has_key?(proxy.name)
-            proxy_hosts[proxy.name] = Array.new
-          end
-          proxy_hosts[proxy.name] << h.id
+          proxy = proxy_selector.determine_proxy(h.host, 'ACD')
+          proxy_hosts[proxy.name] = [] unless proxy_hosts.key?(proxy.name)
+          proxy_hosts[proxy.name] << h
         end
 
-        # TODO just for testing...
-        #proxy_hosts = { Host.first.name => [ Host.first.id] }
+        # TODO: just for testing...
+        # proxy_hosts = { Host.first.name => [ Host.first.id] }
 
         # we need to compose multiple jobs. for each proxy one job.
-        proxy_hosts.each do |proxy_name, host_names|
+        proxy_hosts.each do |proxy_name, foreman_hosts|
           # create the inventory file
-          inventory = ForemanAcd::InventoryCreator.new(@app_instance, host_names).create_inventory
+          inventory = ForemanAcd::InventoryCreator.new(@app_instance, foreman_hosts).create_inventory
           job_input['inventory'] = YAML.dump(inventory)
 
           composer = JobInvocationComposer.for_feature(