foreman_acd 0.5.0 → 0.6.0

data/app/services/foreman_acd/app_deployer.rb

@@ -3,7 +3,6 @@
 module ForemanAcd
   # application instances deployer
   class AppDeployer
-
     delegate :logger, :to => :Rails
 
     def initialize(app_instance)
@@ -11,51 +10,64 @@ module ForemanAcd
     end
 
     def deploy
+      output = []
       services = JSON.parse(@app_instance.app_definition.services)
-      app_hosts = JSON.parse(@app_instance.hosts)
-
-      app_hosts.each do |host_data|
-        begin
-          service_data = services.select { |k| k['id'] == host_data['service'].to_i }.first
-          host_params = set_host_params(host_data, service_data)
-
-          host = nil
-          if host_data.has_key?('foreman_host_id')
-            logger.debug("Try to find host with id #{host_data['foreman_host_id']}")
-            begin
-              host = Host.find(host_data['foreman_host_id'])
-            rescue ActiveRecord::RecordNotFound
-              logger.info("Host with id #{host_data['foreman_host_id']} couldn\'t be found, create a new one!")
-              host = nil
-            end
-          end
-
-          if host.nil?
-            params = host_attributes(host_params)
-            logger.info("Host creation parameters for #{host_data['hostname']}:\n#{params}\n")
-            host = Host.new(params)
-          else
-            logger.info("Update parameters and re-deploy host #{host_data['hostname']}")
-            host.attributes = host_attributes(host_params, host)
-            host.setBuild
-            host.power.reset
-          end
-
-          # REMOVE ME (but very nice for testing)
-          # host.mac = "00:11:22:33:44:55"
-
-          apply_compute_profile(host)
-          host.suggest_default_pxe_loader
-          host.save
-
-          # save the foreman host id
-          host_data['foreman_host_id'] = host.id
-        rescue StandardError => e
-          logger.error("Failed to initiate host creation: #{e.class}: #{e.message}\n#{e.backtrace.join($INPUT_RECORD_SEPARATOR)}")
+      all_hosts = []
+
+      @app_instance.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)
+
+        host = foreman_host.host.presence
+
+        is_rebuild = false
+
+        if host.blank?
+          params = host_attributes(host_params)
+          log_params = params.dup
+          log_params['root_pass'] = '****' if log_params.key?('root_pass')
+          msg = "Host creation parameters for #{foreman_host.hostname}:\n#{log_params}\n"
+          logger.info(msg)
+          output << msg
+          host = Host.new(params)
+        else
+          msg = "Update parameters and re-deploy host #{foreman_host.hostname}"
+          logger.info(msg)
+          output << msg
+          host.attributes = host_attributes(host_params, host)
+          is_rebuild = true
         end
+
+        # REMOVE ME (but very nice for testing)
+        # host.mac = "00:11:22:33:44:55"
+
+        apply_compute_profile(host)
+        host.suggest_default_pxe_loader
+
+        all_hosts << OpenStruct.new(:foreman_host => foreman_host, :host => host, :rebuild => is_rebuild)
       end
 
-      return app_hosts
+      # do this in a second step, so that we get the progress report for all
+      all_hosts.each do |os_host|
+        # Save the host -> will initiate the deployment
+        os_host.host.save!
+        msg = "Saved and initiated/updated host #{os_host.foreman_host.hostname}"
+        logger.info(msg)
+        output << msg
+
+        os_host.host.power.reset if os_host.rebuild
+
+        # save the foreman host id
+        os_host.foreman_host.update!(:host_id => os_host.host.id)
+
+        progress_report = Rails.cache.fetch(os_host.host.progress_report_id)
+        os_host.foreman_host.update!(:last_progress_report => progress_report)
+        if progress_report.empty?
+          msg = "Progress report for #{os_host.foreman_host.hostname} is empty!"
+          output << msg
+        end
+      end
+      output
     end
 
     private
@@ -91,20 +103,20 @@ module ForemanAcd
 
     def hardcoded_params
       result = {}
-      result['managed'] = true
-      result['enabled'] = true
       result['build'] = true
       result['compute_attributes'] = { 'start' => '1' }
+      result['enabled'] = true
       result['host_parameters_attributes'] = []
+      result['managed'] = true
       result
     end
 
-    def set_host_params(host_data, service_data)
+    def set_host_params(foreman_host, service_data)
       result = hardcoded_params
-      result['name'] = host_data['hostname']
+      result['name'] = foreman_host.hostname
       result['hostgroup_id'] = service_data['hostgroup']
 
-      host_data['foremanParameters'].each do |param|
+      JSON.parse(foreman_host.foremanParameters).each do |param|
         case param['type']
 
         when 'computeprofile'

data/app/services/foreman_acd/inventory_creator.rb

@@ -3,12 +3,11 @@
 module ForemanAcd
   # inventory creator for application instances
   class InventoryCreator
-
     delegate :logger, :to => :Rails
 
-    def initialize(app_instance, host_ids)
+    def initialize(app_instance, foreman_hosts)
       @app_instance = app_instance
-      @host_ids = host_ids
+      @foreman_hosts = foreman_hosts
     end
 
     # TODO: this might be part of the smart proxy plugin.
@@ -16,52 +15,40 @@ module ForemanAcd
       inventory = {}
       inventory['all'] = {}
 
-      inventory['all'] = { 'vars' => inventory_all_vars } unless @app_instance.ansible_vars_all.nil? || @app_instance.ansible_vars_all.empty?
+      inventory['all'] = { 'vars' => inventory_all_vars } if @app_instance.ansible_vars_all.present?
 
       services = JSON.parse(@app_instance.app_definition.services)
-      app_hosts = filtered_hosts
 
       children = {}
-      app_hosts.each do |host_data|
-        if host_data['foreman_host_id'].nil?
-          logger.warn "Ignore host #{host_data['hostname']} because no foreman host id could be found. Is the host not provisioned yet?"
+      @foreman_hosts.each do |foreman_host|
+        if foreman_host.host_id.nil?
+          logger.warn "Ignore host #{foreman_h.hostname} because no foreman host id could be found. Is the host not provisioned yet?"
           next
         end
 
-        service_id = host_data['service'].to_i
+        service_id = foreman_host.service.to_i
         host_service = services.select { |s| s['id'] == service_id }.first
         ansible_group = host_service['ansibleGroup']
 
-        unless children.has_key?(host_service['ansibleGroup'])
-          children[ansible_group] = { 'hosts' => {} }
-        end
+        children[ansible_group] = { 'hosts' => {} } unless children.key?(host_service['ansibleGroup'])
 
-        ansible_vars = host_data['ansibleParameters'].map { |v| { v['name'] => v['value'] } }.reduce({}, :merge!)
+        ansible_vars = JSON.parse(foreman_host.ansibleParameters).map { |v| { v['name'] => v['value'] } }.reduce({}, :merge!)
 
         # in case there is no ansible_user defined, set "root" as default.
-        unless ansible_vars.has_key?('ansible_user')
-          ansible_vars['ansible_user'] = 'root'
-        end
+        ansible_vars['ansible_user'] = 'root' unless ansible_vars.key?('ansible_user')
 
-        children[ansible_group]['hosts'][get_fqdn(host_data['foreman_host_id'])] = ansible_vars
+        children[ansible_group]['hosts'][foreman_host.host.name] = ansible_vars
       end
       inventory['all']['children'] = children
       inventory
     end
 
     private
+
     def inventory_all_vars
       JSON.parse(@app_instance.ansible_vars_all).map do |a|
         { a['name'] => a['value'] }
       end.reduce({}, :merge!)
     end
-
-    def get_fqdn(host_id)
-      Host.find(host_id)&.name
-    end
-
-    def filtered_hosts
-      JSON.parse(@app_instance.hosts).select{ |h| h&.key?('foreman_host_id') && @host_ids.include?(h['foreman_host_id']) }
-    end
   end
 end

data/app/views/foreman_acd/ansible_playbooks/_form.html.erb

@@ -3,6 +3,12 @@
 
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab"><%= _('Ansible playbooks') %></a></li>
+    <% if show_location_tab? %>
+          <li><a href="#locations" data-toggle="tab"><%= _("Locations") %></a></li>
+      <% end %>
+      <% if show_organization_tab? %>
+          <li><a href="#organizations" data-toggle="tab"><%= _("Organizations") %></a></li>
+      <% end %>
   </ul>
 
   <div class="tab-content">
@@ -13,8 +19,11 @@
       <% # TODO:
          # select_f(f, :scm_type, %w[Directory GIT], :downcase, :to_s)
       %>
-      <%= text_f f, :path %>
-      <%= text_f f, :playfile %>
+      <%= text_f f, :path, :required => true %>
+      <%= text_f f, :playfile, :required => true %>
+    </div>
+
+    <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @ansible_playbook %>
   </div>
 
   <%= submit_or_cancel f %>

data/app/views/foreman_acd/ansible_playbooks/edit.html.erb

@@ -1,3 +1,11 @@
+<%=
+  breadcrumbs(:resource_url => "/acd/api/v2/ansible_playbooks",
+              :items => [
+                { :caption => _('Ansible Playbooks'),
+                  :url => url_for(ansible_playbooks_path) },
+                { :caption => "Edit #{@ansible_playbook.name}",
+                  :url => (edit_ansible_playbook_path(@ansible_playbook) if authorized_for(hash_for_edit_ansible_playbook_path(@ansible_playbook))) }
+              ])
+%>
 <% title(_('Edit Ansible Playbook %s') % @ansible_playbook) %>
-
 <%= render :partial => 'form' %>

data/app/views/foreman_acd/ansible_playbooks/index.html.erb

@@ -12,12 +12,12 @@
   </tr>
   <% for ansible_playbook in @ansible_playbooks %>
     <tr>
-      <td><%=link_to_if_authorized h(ansible_playbook.name), hash_for_edit_ansible_playbook_path(:id => ansible_playbook).merge(:auth_object => ansible_playbook, :authorizer => authorizer) %></td>
+      <td><%=link_to_if_authorized h(ansible_playbook.name), hash_for_edit_ansible_playbook_path(:id => ansible_playbook) %></td>
       <td><%= ansible_playbook.description %></td>
       <td>
         <%= action_buttons(
-          display_link_if_authorized(_("Import group variables"), hash_for_import_vars_ansible_playbook_path(:id => ansible_playbook).merge(:auth_object => ansible_playbook, :authorizer => authorizer)),
-          display_delete_if_authorized(hash_for_ansible_playbook_path(:id => ansible_playbook).merge(:auth_object => ansible_playbook, :authorizer => authorizer),
+          display_link_if_authorized(_("Import groups"), hash_for_import_vars_ansible_playbook_path(:id => ansible_playbook)),
+          display_delete_if_authorized(hash_for_ansible_playbook_path(:id => ansible_playbook),
                                        :data => { 'confirm': _('Delete %s?') % ansible_playbook.name })
         ) %>
       </td>

data/app/views/foreman_acd/api/v2/ansible_playbooks/base.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @ansible_playbook
 
 attributes :id, :name

data/app/views/foreman_acd/api/v2/ansible_playbooks/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @ansible_playbooks
 
 extends 'foreman_acd/api/v2/ansible_playbooks/base'

data/app/views/foreman_acd/api/v2/ansible_playbooks/show.json.rabl

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
 object @ansible_playbook
 
 extends 'foreman_acd/api/v2/ansible_playbooks/base'
+
+node do |ansible_playbook|
+  partial('api/v2/taxonomies/children_nodes', :object => ansible_playbook)
+end

data/app/views/foreman_acd/api/v2/app_definitions/base.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @app_definition
 
 attributes :id, :name

data/app/views/foreman_acd/api/v2/app_definitions/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @app_definitions
 
 extends 'foreman_acd/api/v2/app_definitions/base'

data/app/views/foreman_acd/api/v2/app_definitions/show.json.rabl

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
 object @app_definition
 
 extends 'foreman_acd/api/v2/app_definitions/base'
+
+node do |app_definition|
+  partial('api/v2/taxonomies/children_nodes', :object => app_definition)
+end

data/app/views/foreman_acd/api/v2/app_instances/base.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @app_instance
 
-attributes :id, :name
+attributes :id, :name, :organization_id, :organization_name, :location_id, :location_name

data/app/views/foreman_acd/api/v2/app_instances/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @app_instances
 
 extends 'foreman_acd/api/v2/app_instances/base'

data/app/views/foreman_acd/api/v2/app_instances/show.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @app_instance
 
 extends 'foreman_acd/api/v2/app_instances/base'

data/app/views/foreman_acd/app_definitions/_form.html.erb

@@ -30,6 +30,12 @@
   <%= base_errors_for @app_definition %>
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab"><%= _('Application Definitions') %></a></li>
+    <% if show_location_tab? %>
+          <li><a href="#locations" data-toggle="tab"><%= _("Locations") %></a></li>
+      <% end %>
+      <% if show_organization_tab? %>
+          <li><a href="#organizations" data-toggle="tab"><%= _("Organizations") %></a></li>
+      <% end %>
   </ul>
 
   <div class="tab-content">
@@ -40,6 +46,8 @@
       <div id='app_definition'></div>
       <%=  mount_react_component('ApplicationDefinition', "#app_definition", json.to_json) %>
     </div>
+
+    <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @app_definition %>
   </div>
 
   <%= submit_or_cancel f %>

data/app/views/foreman_acd/app_definitions/edit.html.erb

@@ -1,10 +1,15 @@
-<% title(_('Edit Application Definition %s') % @app_definition) %>
-
-<%= breadcrumbs(
-  :resource_url => acd_api_v2_app_definitions_path
-  )
+<%=
+  breadcrumbs(:resource_url => "/acd/api/v2/app_definitions",
+              :items => [
+                { :caption => _('App Definitions'),
+                  :url => url_for(app_definitions_path) },
+                { :caption => "Edit #{@app_definition.name}",
+                  :url => (edit_app_definition_path(@app_definition) if authorized_for(hash_for_edit_app_definition_path(@app_definition))) }
+              ])
 %>
 
+<% title(_('Edit Application Definition %s') % @app_definition) %>
+
 <% content_for(:javascripts) do %>
   <%= webpacked_plugins_js_for :foreman_acd %>
 <% end %>

data/app/views/foreman_acd/app_definitions/index.html.erb

@@ -2,7 +2,7 @@
 
 <% title_actions button_group(
   new_link(_('New Application Definition')),
-  display_link_if_authorized(_("Import"), hash_for_import_app_definitions_path, :class => 'btn btn-default')
+  display_link_if_authorized(_("Import"), hash_for_import_app_definitions_path, :class => 'btn btn-default', :style => "display: none;") 
 ) %>
 
 <table class="table table-bordered table-striped">
@@ -13,13 +13,13 @@
   </tr>
   <% for app_definition in @app_definitions %>
     <tr>
-      <td><%=link_to_if_authorized h(app_definition.name), hash_for_edit_app_definition_path(:id => app_definition).merge(:auth_object => app_definition, :authorizer => authorizer) %></td>
+      <td><%=link_to_if_authorized h(app_definition.name), hash_for_edit_app_definition_path(:id => app_definition) %></td>
       <td><%= app_definition.description %></td>
       <td>
         <%= action_buttons(
-          display_delete_if_authorized(hash_for_app_definition_path(:id => app_definition).merge(:auth_object => app_definition, :authorizer => authorizer),
+          display_delete_if_authorized(hash_for_app_definition_path(:id => app_definition),
                                        :data => { 'confirm': _('Delete %s?') % app_definition.name }),
-          display_link_if_authorized(_("Export"), hash_for_export_app_definition_path(:id => app_definition).merge(:auth_object => app_definition, :authorizer => authorizer))
+          # TODO: add export feature again if app-def + ansible playbook can be exported together display_link_if_authorized(_("Export"), hash_for_export_app_definition_path(:id => app_definition))
         ) %>
       </td>
     </tr>

data/app/views/foreman_acd/app_instances/_form.html.erb

@@ -20,7 +20,7 @@
           "id": @app_instance.app_definition.id,
           "name": @app_instance.app_definition.name,
         },
-        "hosts": JSON.parse(@app_instance.hosts),
+        "hosts": collect_hosts_data,
         "ansibleVarsAll": @app_instance.ansible_vars_all.blank? ? [] : JSON.parse(@app_instance.ansible_vars_all),
       }
     end
@@ -42,7 +42,7 @@
       </div>
     </div>
   </div>
-
+  <%= f.hidden_field :organization_id %>
+  <%= f.hidden_field :location_id %>
   <%= submit_or_cancel f %>
 <% end %>
-

data/app/views/foreman_acd/app_instances/edit.html.erb

@@ -1,3 +1,13 @@
+<%=
+  breadcrumbs(:resource_url => "/acd/api/v2/app_instances?location_id=#{@location.id}&organization_id=#{@organization.id}",
+              :items => [
+                { :caption => _('App Instances'),
+                  :url => url_for(app_instances_path) },
+                { :caption => "Edit #{@app_instance.name}",
+                  :url => (edit_app_instance_path(@app_instance) if authorized_for(hash_for_edit_app_instance_path(@app_instance))) }
+              ])
+%>
+
 <% title(_('Edit Application Instance %s') % @app_instance) %>
 
 <% content_for(:javascripts) do %>