foreman_acd 0.7.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b616c7ba21eea339af8509f618585dcd949ddead6ecdec57278a62c751e4fd2
-  data.tar.gz: 75c7d2e2c07d306dee127bc50c6b300934f90066bc4a491e49f17f65ac6b7c24
+  metadata.gz: a14a2b2d7f2353e0a908bf3b0de9ea3126fff402e1003f9bea648afe260c73c0
+  data.tar.gz: 6eecc24dc7be78b4ddc04da2b50a525dd95a2b358647d8701e1ea6479eef5332
 SHA512:
-  metadata.gz: bba62637508bbbd4e35772a55ad1126fea7a8cb3c1658c6f734b02ccf03d44048db40fa621bb51e796220668e7a49e8b03c3169a77b818f6dbbde117d09edfe2
-  data.tar.gz: a6e4ba1bb97250e8bcebe6180abcf4755859b73828febda64353b47021acadcc33fd99e2ab4b45ac965e5d643c368bbfb47aee421a80979c7a4c69354a18b297
+  metadata.gz: 372bb6339ec6ff38e80dbc8df019083ff76a660c64cd23b40ab7da5b6c035617e7395f3c2738a04f21dd327c796ca959cb250ef6bbbbfb4b23d1220177ffab6f
+  data.tar.gz: 5a68e1cb910e7fca00e0f44172ff391a93557a7c9febbb8eb40a2711471c7d67bfc29ea5c70e763a7b94aa7c732e406b42d2d36daa05971f950824c6eae10d80

data/README.md

@@ -1,5 +1,3 @@
-[![Build Status master](https://travis-ci.org/ATIX-AG/foreman_acd.svg?branch=master)](https://travis-ci.org/ATIX-AG/foreman_acd)
-
 # Foreman Application Centric Deployment
 
 A Foreman plugin providing application centric deployment and a self-service portal.
@@ -55,6 +53,10 @@ This plugin aims to setup all six hosts and to deploy the application.
 
 :warning: This plugin is still in development.
 
+## Documentation
+
+See [Application Centric Deployment Guide](https://docs.theforeman.org/nightly/Application_Centric_Deployment/index-foreman-el.html)
+
 ## Installation
 
 See the [installation](https://theforeman.org/plugins/#2.Installation) chapter of the Foreman plugins documentation on how to install Foreman plugins.
@@ -88,7 +90,7 @@ You need to refresh the smart proxy features in *Infrastructure > Smart Proxies
 ### Ansible Playbook
 
 * Copy (or checkout a git repository) an Ansible playbook.
-Store it in `/etc/foreman/plugins/foreman_acd/ansible-playbooks/` so that SELinux is able to read it.
+Store it in `/var/lib/foreman/foreman_acd/ansible-playbooks/` so that SELinux is able to read it.
 * Add a new Ansible Playbook via *Applications > Ansible Playbooks*.
 * Specify the path to the Ansible playbook and name of the playbook file. (e.g. `site.yml`).
 * Save it and press *Import group variables* for this newly created Ansible playbook.
@@ -117,8 +119,6 @@ All Foreman parameters require a value.
 
 ## TODO
 
-* Add `git` support for the Ansible playbooks.
-* Provide application templates which contains application definition and the required Ansible-playbook.
 * Add Saltstack support to configure the application.
 * Extend the Foreman parameter and value validation.
 

data/app/controllers/foreman_acd/ansible_playbooks_controller.rb

@@ -77,9 +77,20 @@ module ForemanAcd
           logger.info("HTTP Proxy used: #{git.config['http.proxy']}")
         end
 
+        if sync_params[:git_commit].empty?
+          if ForemanAcd.proxy_setting.present?
+            err_msg = _('Please set the Git Branch/Tag/Commit. This setting is necessary if a HTTP proxy is used!')
+            raise StandardError.new err_msg
+          else
+            commit = Git.ls_remote(sync_params[:git_url])['head'][:sha]
+          end
+        else
+          commit = sync_params[:git_commit]
+        end
+
         git.add_remote('origin', sync_params[:git_url])
         git.fetch
-        git.checkout(sync_params[:git_commit])
+        git.checkout(commit)
 
         session[:git_path] = git.dir.path
       rescue StandardError => e
@@ -189,7 +200,11 @@ module ForemanAcd
     end
 
     def remove_ansible_dir(dirpath)
-      FileUtils.remove_dir(dirpath) if Dir.exist?(dirpath)
+      unless dirpath.start_with? ForemanAcd.ansible_playbook_path
+        logger.error("Sorry, the directory #{dirpath} is not within #{ForemanAcd.ansible_playbook_path} and will therefore not be cleaned up!")
+        return false
+      end
+      FileUtils.rm_rf(dirpath) if Dir.exist?(dirpath)
     end
 
     def ansible_playbook_full_path(dirname)

data/app/controllers/foreman_acd/app_definitions_controller.rb

@@ -9,7 +9,7 @@ module ForemanAcd
     before_action :find_resource, :only => [:edit, :update, :destroy, :export]
     before_action :read_hostgroups, :only => [:edit, :new, :import]
     before_action :read_ansible_playbooks, :only => [:edit, :new]
-    before_action :handle_file_upload, :only => [:create]
+    before_action :assign_ansible_playbook, :only => [:create]
 
     def index
       @app_definitions = resource_base.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])
@@ -37,6 +37,9 @@ module ForemanAcd
           process_error
         end
       rescue StandardError, ValidationError => e
+        if params[:foreman_acd_app_definition_import].present?
+          AnsiblePlaybook.find(params[:foreman_acd_app_definition][:acd_ansible_playbook_id]).delete if params[:foreman_acd_app_definition][:acd_ansible_playbook_id].present?
+        end
         redirect_to new_app_definition_path, :flash => { :error => _(e.message) }
       end
     end
@@ -75,16 +78,110 @@ module ForemanAcd
     end
 
     def export
-      filename = "#{@app_definition.name}.yaml"
-      data = JSON.parse(@app_definition.services).to_yaml
-      send_data data, :type => 'text/yaml', :disposition => 'attachment', :filename => filename
+      dir_path = "#{Dir.mktmpdir}/#{@app_definition.name}.tar"
+      `tar -cvf "#{dir_path}" "#{@app_definition.ansible_playbook.path}" #{export_app_template_data.path}`
+      logger.info("Successfully created application template tar file for #{@app_definition.name}")
+      send_file dir_path
+    rescue StandardError => e
+      logger.info("Export of #{@app_definition.name} failed with the error: #{e}")
+      redirect_to app_definitions_path, :flash => { :error => _(e.message) }
+    end
+
+    def handle_file_upload
+      return unless params[:app_definition_file] && (raw_directory = params[:app_definition_file])
+      begin
+        dir = Dir.mktmpdir
+        untar_import_directory(raw_directory, dir)
+        ansible_file = Dir.glob("#{dir}/tmp/*.yaml")
+        data = JSON.parse(YAML.load_file(ansible_file[0]).to_json) if ansible_file
+        ansible_playbook_import = data.find { |d| d if d['ansible_playbook'] }
+
+        session[:ansible_playbook_params] = { :dir => dir, :ansible_playbook => ansible_playbook_import['ansible_playbook'] }
+        render :json => { :ansible_services => create_ansible_services(data, ansible_playbook_import) }, :status => :ok
+      rescue StandardError => e
+        render :json => { :status => 'error', :message => e }, :status => :internal_server_error
+      end
     end
 
     private
 
-    def handle_file_upload
-      return unless params[:foreman_acd_app_definition] && (raw_file = params[:foreman_acd_app_definition][:app_definition_file])
-      params[:foreman_acd_app_definition][:services] = YAML.load_file(raw_file.tempfile).to_json
+    def export_app_template_data
+      file = Tempfile.open([@app_definition.name, '.yaml'])
+      data = JSON.parse(@app_definition.services).append(:ansible_playbook => @app_definition.ansible_playbook.attributes.except('id', 'created_at', 'updated_at').as_json).to_yaml
+      file.write(data)
+      file.close
+      logger.info("Successfully created yaml file for app_template data: #{file.path}")
+      file
+    rescue StandardError => e
+      logger.info("Creation of app template data failed: #{e}")
+      redirect_to app_definitions_path, :flash => { :error => _(e.message) }
+    end
+
+    def rename_path_name(dir_path)
+      return dir_path unless Dir.exist?(dir_path)
+      ind = 1
+      loop do
+        path = dir_path
+        path += ind.to_s
+        return path unless Dir.exist?(path)
+        ind += 1
+      end
+    end
+
+    def create_ansible_playbook(dir, ansible_playbook, dir_path)
+      FileUtils.cp_r "#{dir}/#{ansible_playbook['path']}/.", dir_path
+      ansible_playbook['path'] = dir_path
+      ansible_playbook['name'] = File.basename(dir_path)
+      new_playbook = AnsiblePlaybook.create(ansible_playbook)
+      new_playbook
+    rescue StandardError => e
+      logger.info("Error while creating AnsiblePlaybook: #{e}")
+    end
+
+    def create_ansible_services(data, ansible_playbook_import)
+      ansible_services = []
+      session[:data_services] = data - [ansible_playbook_import]
+      session[:data_services].each do |d|
+        ansible_services.append({ :id => d['id'], :value => d['name'] })
+      end
+      ansible_services
+    end
+
+    def untar_import_directory(directory, dir)
+      `tar -xvf  #{directory.path} -C #{dir}`
+    rescue StandardError => e
+      logger.info("Failed to untar imported directory: #{e}")
+    end
+
+    def assign_ansible_playbook
+      return unless params[:foreman_acd_app_definition_import]
+      dir_path = "#{ForemanAcd.ansible_playbook_path}/#{session[:ansible_playbook_params][:ansible_playbook]['name'].split(/\W+/).join('_')}"
+
+      # Append path and name of ansible with n + 1 if ansible_playbook with same name or name[n] exists
+      ansible_playbook = create_ansible_playbook(session[:ansible_playbook_params][:dir], session[:ansible_playbook_params][:ansible_playbook], rename_path_name(dir_path))
+      params[:foreman_acd_app_definition][:acd_ansible_playbook_id] = ansible_playbook.id
+
+      begin
+        services = JSON.parse(params[:foreman_acd_app_definition_import][:services])
+        flag = 0
+        session[:data_services].each do |d|
+          hostgroup = services.find { |service| service['name'] == d['name'] }['hostgroup']
+          if hostgroup == ''
+            flag += 1
+            break
+          else
+            d['hostgroup'] = hostgroup
+          end
+        end
+        params[:foreman_acd_app_definition][:services] = session[:data_services].to_json
+      rescue StandardError => e
+        ansible_playbook&.destroy
+        redirect_to({ :action => 'import' }, :error => _("Hostgroups are not configured properly: #{e}"))
+      else
+        ansible_playbook&.destroy
+        redirect_to({ :action => 'import' }, :error => _('Some services are not assigned Hostgroups')) if flag.positive?
+      end
+      session[:data_services] = nil
     end
   end
 end

data/app/controllers/foreman_acd/app_instances_controller.rb

@@ -3,8 +3,9 @@
 module ForemanAcd
   # Application Instance Controller
   class AppInstancesController < ::ForemanAcd::ApplicationController
-    include Foreman::Controller::AutoCompleteSearch
+    include ::Foreman::Controller::AutoCompleteSearch
     include ::ForemanAcd::Concerns::AppInstanceParameters
+    include ::ForemanAcd::Concerns::AppInstanceMixins
 
     before_action :find_resource, :only => [:edit, :update, :destroy_with_hosts, :deploy, :report]
     before_action :read_applications, :only => [:new, :edit]
@@ -73,13 +74,17 @@ module ForemanAcd
 
     def deploy
       value = false
+      @app_instance.update!({ :last_deploy_task_id => nil,
+                              :initial_configure_task_id => nil })
+      @app_instance.foreman_hosts.each { |f| f.update!(:last_progress_report => nil) }
       @app_instance.clean_all_hosts if params[:delete_hosts]
       value = safe_deploy? if params[:safe_deploy]
       session.delete(:remember_hosts)
       logger.info('Run async foreman task to deploy hosts')
       async_task = ForemanTasks.async_task(::Actions::ForemanAcd::DeployAllHosts, @app_instance, value)
       @app_instance.update!(:last_deploy_task => async_task)
-      process_success(:success_msg => _('Started task to deploy hosts for %s') % @app_instance)
+
+      redirect_to report_app_instance_path, :success => _('Started task to deploy hosts for %s') % @app_instance
     rescue StandardError => e
       error_msg = "Error happend while deploying hosts of #{@app_instance}: #{e.message}"
       logger.error("#{error_msg} - #{e.class}\n#{e.backtrace.join($INPUT_RECORD_SEPARATOR)}")
@@ -92,7 +97,7 @@ module ForemanAcd
     end
 
     def report
-      @report_hosts = collect_host_report_data
+      @report_hosts = collect_host_report_data(@app_instance)
       logger.debug("app instance host details: #{@report_hosts.inspect}")
     end
 
@@ -112,8 +117,12 @@ module ForemanAcd
           # Store hosts if updated for safe deploy
           session[:remember_hosts] << updated_host.id if updated_host.updated_at != old_host.updated_at
         else
-          @app_instance.foreman_hosts.create(:hostname => h['hostname'], :service => h['service'], :description => h['description'],
-                                             :foremanParameters => JSON.dump(h['foremanParameters']), :ansibleParameters => JSON.dump(h['ansibleParameters']))
+          @app_instance.foreman_hosts.create(:hostname => h['hostname'],
+                                             :service => h['service'],
+                                             :description => h['description'],
+                                             :is_existing_host => h['isExistingHost'],
+                                             :foremanParameters => JSON.dump(h['foremanParameters']),
+                                             :ansibleParameters => JSON.dump(h['ansibleParameters']))
           # Store new hosts for safe deploy
           session[:remember_hosts] << @app_instance.foreman_hosts.find_by(:hostname => h['hostname']).id
         end
@@ -132,6 +141,7 @@ module ForemanAcd
           :hostname => h.hostname,
           :service => h.service,
           :description => h.description,
+          :isExistingHost => h.is_existing_host,
           :foremanParameters => JSON.parse(h.foremanParameters),
           :ansibleParameters => JSON.parse(h.ansibleParameters)
         }
@@ -152,30 +162,5 @@ module ForemanAcd
     def read_applications
       @applications = AppDefinition.all.map { |elem| { elem.id => elem.name } }.reduce({}) { |h, v| h.merge v }
     end
-
-    def collect_host_report_data
-      report_data = []
-
-      @app_instance.foreman_hosts.each do |foreman_host|
-        a_host = {
-          :id => nil,
-          :name => foreman_host.hostname,
-          :build => nil,
-          :hostUrl => nil,
-          :progress_report => foreman_host.last_progress_report.empty? ? [] : JSON.parse(foreman_host.last_progress_report)
-        }
-
-        if foreman_host.host.present?
-          a_host.update({
-                          :id => foreman_host.host.id,
-                          :build => foreman_host.host.build,
-                          :hostUrl => host_path(foreman_host.host),
-                          :powerStatusUrl => power_api_host_path(foreman_host.host)
-                        })
-        end
-        report_data << a_host
-      end
-      report_data
-    end
   end
 end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module ForemanAcd
+  module Concerns
+    # Shared code for AppInstance API and UI controller
+    module AppInstanceMixins
+      extend ActiveSupport::Concern
+
+      def collect_host_report_data(app_instance)
+        report_data = []
+
+        app_instance.foreman_hosts.each do |foreman_host|
+          a_host = {
+            :id => nil,
+            :name => foreman_host.hostname,
+            :build => nil,
+            :hostUrl => nil,
+            :progress_report => foreman_host.last_progress_report.empty? ? [] : JSON.parse(foreman_host.last_progress_report)
+          }
+
+          if foreman_host.host.present?
+            a_host.update({
+                            :id => foreman_host.host.id,
+                            :build => foreman_host.host.build,
+                            :hostUrl => host_path(foreman_host.host),
+                            :isExistingHost => foreman_host.is_existing_host,
+                            :powerStatusUrl => power_api_host_path(foreman_host.host)
+                          })
+          end
+          report_data << OpenStruct.new(a_host)
+        end
+        report_data
+      end
+    end
+  end
+end

data/app/controllers/ui_acd_controller.rb

@@ -2,6 +2,8 @@
 
 # Controller to create JSON data to be used in react app
 class UiAcdController < ::Api::V2::BaseController
+  include ::ForemanAcd::Concerns::AppInstanceMixins
+
   def app
     @app_data = {}
     app_definition = ForemanAcd::AppDefinition.find(params[:id])
@@ -16,9 +18,17 @@ class UiAcdController < ::Api::V2::BaseController
     @ansible_data = collect_ansible_data(params['id'])
   end
 
+  def report_data
+    @report_data = collect_report_data(params['id'])
+  end
+
+  def validate_hostname
+    @host_validation = hostname_duplicate?(params['appDefId'].to_i, params['serviceId'].to_i, params['hostname'])
+  end
+
   def action_permission
     case params[:action]
-    when 'app', 'foreman_data', 'ansible_data'
+    when 'app', 'foreman_data', 'ansible_data', 'validate_hostname'
       :view
     else
       super
@@ -30,17 +40,46 @@ class UiAcdController < ::Api::V2::BaseController
   def collect_foreman_data(hostgroup_id)
     hg = Hostgroup.find(hostgroup_id)
     fdata = OpenStruct.new(
-      :environments => Environment.all,
-      :lifecycle_environments => Katello::KTEnvironment.all,
       :domains => Domain.all,
       :computeprofiles => ComputeProfile.all,
       :hostgroup_id => hg.id,
       :ptables => hg&.operatingsystem&.ptables
     )
+
+    fdata[:environments] = Environment.all if defined?(ForemanPuppet)
+    fdata[:lifecycle_environments] = Katello::KTEnvironment.all if defined?(Katello)
+
     fdata
   end
 
   def collect_ansible_data(playbook_id)
     ForemanAcd::AnsiblePlaybook.find(playbook_id).as_unified_structobj
   end
+
+  def collect_report_data(app_instance_id)
+    app_instance = ForemanAcd::AppInstance.find(app_instance_id)
+
+    report_data = {
+      :hosts => collect_host_report_data(app_instance),
+      :deploymentState => app_instance.deployment_state.to_s,
+      :initialConfigureState => app_instance.initial_configure_state.to_s
+    }
+    report_data['initialConfigureJobUrl'] = job_invocation_path(app_instance.initial_configure_job) unless app_instance.initial_configure_job.nil?
+
+    OpenStruct.new(report_data)
+  end
+
+  def hostname_duplicate?(app_def_id, service_id, hostname)
+    app_definition = ForemanAcd::AppDefinition.find(app_def_id)
+    service_data = JSON.parse(app_definition.services).select { |k| k['id'] == service_id }.first
+    domain_name = Hostgroup.find(service_data['hostgroup']).domain.name
+    validation_hostname = "#{hostname}.#{domain_name}"
+
+    vdata = OpenStruct.new(
+      :hostname => hostname,
+      :fqdn => validation_hostname,
+      :result => Host.find_by(:name => validation_hostname).nil?
+    )
+    vdata
+  end
 end

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

@@ -19,6 +19,7 @@ module Actions
           if result.success
             ::Foreman::Logging.logger('foreman_acd').info "Creating job to configure the app #{app_instance}"
             job.trigger!
+            output[:configure_job_id] = job.job_invocation.id
           else
             ::Foreman::Logging.logger('foreman_acd').error "Could not create the job to configure the app #{app_instance}: #{result.error}"
           end

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

@@ -5,47 +5,60 @@ module ForemanAcd
   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?
+        before_provision :initiate_acd_app_configurator_after_host_deployment, :if => :deployed_via_acd?
+        before_destroy :check_deletable, :prepend => true, :if => :deployed_via_acd?
+
+        has_many :app_instances, :through => :foreman_hosts, :class_name => 'ForemanAcd::AppInstance'
+
+        scoped_search :relation => :app_instances,
+                      :on => :name,
+                      :rename => :acd_app_instance,
+                      :only_explicit => true,
+                      :complete_value => true,
+                      :operators => ['= '],
+                      :ext_method => :find_by_acd_app_instance_name
+      end
+
+      base.singleton_class.prepend ClassMethods
+    end
+
+    # New class methods for Host::Managed
+    module ClassMethods
+      def find_by_acd_app_instance_name(_key, operator, acd_instance_name)
+        cond = sanitize_sql_for_conditions(["acd_app_instances.name #{operator} ?", value_to_sql(operator, acd_instance_name)])
+        hosts = ForemanAcd::AppInstance.where(cond).joins(:foreman_hosts).pluck(:host_id)
+        if hosts.empty?
+          { :condition => '1=0' }
+        else
+          { :conditions => Host::Managed.arel_table[:id].in(hosts).to_sql }
+        end
       end
     end
 
     def deployed_via_acd?
-      find_app_instance_host
-      @app_instance_host.present?
+      find_foreman_host
+      @foreman_host.present?
     end
 
     private
 
-    def find_app_instance_host
-      @app_instance_host = ForemanAcd::ForemanHost.find_by(:host_id => id)
+    def check_deletable
+      return if @foreman_host.blank?
+      ::Foreman::Logging.logger('foreman_acd').warn "Could not delete host '#{name}' because it is used in Applications > App Instances '#{@foreman_host.app_instance.name}'"
+      raise _("Could not delete host '%{host_name}' because it is used in Applications > App Instances '%{app_instance_name}'") % {
+        :host_name => name, :app_instance_name => @foreman_host.app_instance.name
+      }
     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
+    def find_foreman_host
+      @foreman_host = ForemanAcd::ForemanHost.find_by(:host_id => id)
     end
 
-    def start_acd_app_configurator
-      ForemanTasks.delay(::Actions::ForemanAcd::RunConfigurator,
-                         { :start_at => Time.zone.now + RUN_CONFIGURATOR_DELAY },
-                         @app_instance_host.app_instance)
+    def initiate_acd_app_configurator_after_host_deployment
+      return if @foreman_host.blank?
+      ForemanAcd.initiate_acd_app_configurator(@foreman_host.app_instance)
     end
   end
 end

data/app/models/foreman_acd/app_instance.rb

@@ -11,6 +11,7 @@ module ForemanAcd
 
     self.table_name = 'acd_app_instances'
     belongs_to :last_deploy_task, :class_name => 'ForemanTasks::Task'
+    belongs_to :initial_configure_task, :class_name => 'ForemanTasks::Task'
     validates :name, :presence => true, :uniqueness => true
     validates :app_definition, :presence => true
     belongs_to :app_definition, :inverse_of => :app_instances
@@ -32,7 +33,7 @@ module ForemanAcd
     end
 
     def clean_all_hosts
-      remember_host_ids = foreman_hosts.map(&:host_id)
+      remember_host_ids = foreman_hosts.select(&:fresh_host?).map(&:host_id)
 
       # Clean the app instance association first
       foreman_hosts.update_all(:host_id => nil)
@@ -43,12 +44,56 @@ module ForemanAcd
 
     def clean_hosts_by_id(ids = [])
       # Clean the app instance association first
-      foreman_hosts.where(:host_id => ids).update_all(:host_id => nil)
+      foreman_hosts.where(:host_id => ids, :is_existing_host => false).update_all(:host_id => nil)
 
       # Remove all hosts afterwards
       delete_hosts(ids)
     end
 
+    def hosts_deployment_finished?
+      return true if all_hosts_deployed?
+
+      ::Foreman::Logging.logger('foreman_acd').info('Another host is still in build-phase. Wait for it...')
+      false
+    end
+
+    def deployment_state
+      return :new if last_deploy_task.nil?
+      return :initiated if !last_deploy_task.nil? && last_deploy_task.ended_at.nil?
+
+      state = if all_hosts_deployed?
+                :finished
+              elsif last_deploy_task.ended_at? && last_deploy_task.result != 'success'
+                :failed
+              else
+                :pending
+              end
+      state
+    end
+
+    def initial_configure_job
+      return nil if initial_configure_task.nil?
+      return JobInvocation.find(initial_configure_task.output['configure_job_id']) if initial_configure_task.output.key?('configure_job_id') &&
+                                                                                      !initial_configure_task.output['configure_job_id'].nil?
+      nil
+    end
+
+    def initial_configure_state
+      return :unconfigured if initial_configure_job.nil? && initial_configure_task.nil?
+      return :scheduled if initial_configure_job.nil?
+      return :pending unless initial_configure_job.finished?
+      initial_configure_job.status_label.to_sym
+    end
+
+    private
+
+    def all_hosts_deployed?
+      foreman_hosts.each do |foreman_host|
+        return false if foreman_host.host.nil? || foreman_host.host.build?
+      end
+      true
+    end
+
     def delete_hosts(ids = [])
       return if ids.empty?
       ids.each do |host_id|

data/app/models/foreman_acd/foreman_host.rb

@@ -16,6 +16,14 @@ module ForemanAcd
       _('Foreman Host')
     end
 
+    def fresh_host?
+      !is_existing_host
+    end
+
+    def existing_host?
+      is_existing_host
+    end
+
     def self.permission_name
       'foreman_hosts'
     end

data/app/services/foreman_acd/app_deployer.rb

@@ -22,8 +22,17 @@ module ForemanAcd
 
       foreman_hosts.each do |foreman_host|
         service_data = services.select { |k| k['id'] == foreman_host.service.to_i }.first
-        host_params = set_host_params(foreman_host, service_data)
 
+        # Handle already deployed hosts
+        if foreman_host.existing_host?
+          domain = Hostgroup.find(service_data['hostgroup']).domain.name
+          fqdn = "#{foreman_host.hostname}.#{domain}"
+          h =  Host.find_by(:name => fqdn)
+          foreman_host.update!(:host_id => h.id)
+          next
+        end
+
+        host_params = set_host_params(foreman_host, service_data)
         host = foreman_host.host.presence
 
         is_rebuild = false
@@ -45,7 +54,10 @@ module ForemanAcd
         end
 
         # REMOVE ME (but very nice for testing)
-        # host.mac = "00:11:22:33:44:55"
+        # prng = Random.new
+        # x = prng.rand(100)
+        # y = prng.rand(100)
+        # host.mac = "00:11:22:33:#{x}:#{y}"
 
         apply_compute_profile(host)
         host.suggest_default_pxe_loader
@@ -73,6 +85,11 @@ module ForemanAcd
           output << msg
         end
       end
+
+      # Try to start the configuration, too. In case of a app instance including only already deployed hosts
+      # this would start the configuration job then.
+      ForemanAcd.initiate_acd_app_configurator(@app_instance)
+
       output
     end