foreman_acd 0.2.1 → 0.7.0

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

@@ -0,0 +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

@@ -0,0 +1,30 @@
+<% title _('Ansible Playbooks') %>
+
+<% title_actions button_group(
+  new_link(_('New Ansible Playbook')),
+) %>
+
+<table class="table table-bordered table-striped">
+  <tr>
+    <th><%= sort :name, :as => s_('AnsiblePlaybook|Name') %></th>
+    <th><%= _('Description') %></th>
+    <th></th>
+  </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) %></td>
+      <td><%= ansible_playbook.description %></td>
+      <td>
+        <%= action_buttons(
+          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>
+    </tr>
+  <% end %>
+</table>
+
+<%= page_entries_info @ansible_playbooks %>
+<%= will_paginate @ansible_playbooks %>
+

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

@@ -0,0 +1,3 @@
+<% title _('New Ansible Playbook') %>
+
+<%= render :partial => 'form' %>

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

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

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

@@ -0,0 +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

@@ -0,0 +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

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

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

@@ -0,0 +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

@@ -0,0 +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

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

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

@@ -0,0 +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

@@ -0,0 +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

@@ -1,21 +1,41 @@
 <%
-    json = {
-      "organization": current_organization,
-      "location": current_location,
-      "hostgroups": @hostgroups,
-      "loadForemanDataUrl": ui_acd_fdata_path("__id__"),
-      "services": [],
-    }
-
-    if !@app_definition.name.empty?
-      json["services"] = JSON.parse(@app_definition.services)
-    end
+  json = {
+    "organization": current_organization,
+    "location": current_location,
+    "hostgroups": @hostgroups,
+    "foremanDataUrl": ui_acd_foreman_data_path("__id__"),
+    "ansibleDataUrl": ui_acd_ansible_data_path("__id__"),
+    "services": [],
+    "ansibleVarsAll": [],
+  }
+
+  if @app_definition.new_record?
+    json["mode"] = "newDefinition"
+    json["ansiblePlaybooks"] = @ansible_playbooks
+  else
+    json["mode"] = "editDefinition"
+    json["ansiblePlaybook"] = @app_definition.ansible_playbook.as_unified_structobj
+  end
+
+  if @app_definition.services.present?
+    json["services"] = JSON.parse(@app_definition.services)
+  end
+
+  if @app_definition.ansible_vars_all.present?
+    json["ansibleVarsAll"] = JSON.parse(@app_definition.ansible_vars_all)
+  end
 %>
 
 <%= form_for @app_definition, :url => (@app_definition.new_record? ? app_definitions_path : app_definition_path(:id => @app_definition.id)) do |f| %>
   <%= 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">
@@ -24,8 +44,10 @@
       <%= text_f f, :description %>
 
       <div id='app_definition'></div>
-      <%=  mount_react_component('ApplicationDefinition', "#app_definition", json.to_json) %>
+      <%=  react_component('ApplicationDefinition', :data => 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,3 +1,13 @@
+<%=
+  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 %>

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

@@ -1,25 +1,27 @@
 <%
-    if @app_instance.app_definition_id.blank?
+    if @app_instance.new_record?
       json = {
         "mode": "newInstance",
         "organization": current_organization,
         "location": current_location,
         "applications": @applications,
-        "loadAppDefinitionUrl": ui_acd_app_path("__id__"),
-        "loadForemanDataUrl": ui_acd_fdata_path("__id__"),
+        "appDefinitionUrl": ui_acd_app_path("__id__"),
+        "foremanDataUrl": ui_acd_foreman_data_path("__id__"),
+        "ansibleVarsAll": [],
       }
     else
       json = {
         "mode": "editInstance",
         "organization": current_organization,
         "location": current_location,
-        "loadAppDefinitionUrl": ui_acd_app_path("__id__"),
-        "loadForemanDataUrl": ui_acd_fdata_path("__id__"),
+        "appDefinitionUrl": ui_acd_app_path("__id__"),
+        "foremanDataUrl": ui_acd_foreman_data_path("__id__"),
         "appDefinition": {
           "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
 %>
@@ -36,11 +38,11 @@
       <%= text_f f, :description %>
 
       <div id='app_instance'></div>
-        <%=  mount_react_component('ApplicationInstance', "#app_instance", json.to_json) %>
+        <%=  react_component('ApplicationInstance', :data => json) %>
       </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 %>

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

@@ -7,25 +7,104 @@
     <th><%= sort :name, :as => s_('AppInstance|Name') %></th>
     <th><%= sort :application, :as => _('Application'), :default => 'DESC' %></th>
     <th><%= _('Description') %></th>
+    <th><%= _('Report') %></th>
     <th></th>
   </tr>
   <% for app_instance in @app_instances %>
     <tr>
-      <td><%=link_to_if_authorized h(app_instance.name), hash_for_edit_app_instance_path(:id => app_instance).merge(:auth_object => app_instance, :authorizer => authorizer) %></td>
+      <td><%=link_to_if_authorized h(app_instance.name), hash_for_edit_app_instance_path(:id => app_instance) %></td>
       <td><%= app_instance.app_definition %></td>
       <td><%= app_instance.description %></td>
+      <td><%= link_to_if((authorized_for(:auth_object => app_instance, :authorizer => authorizer, :permission => :report_app_instances) &&
+                         !app_instance.last_deploy_task.nil? && app_instance.last_deploy_task.ended_at?),
+                         _("Show Report"),
+                         hash_for_report_app_instance_path(:id => app_instance),
+                         :method => :get, :title => _("Show last deployment report for application #{app_instance}")) %></td>
       <td>
-        <%= action_buttons(display_link_if_authorized(_("Deploy"), hash_for_deploy_app_instance_path(:id => app_instance), :method => :post,
-                                                        :title => _("Deploy application #{app_instance}")),
-                           display_link_if_authorized(_("Report"), hash_for_report_app_instance_path(:id => app_instance), :method => :get,
-                                                        :title => _("Show last deployment report for application #{app_instance}")),
-                           display_delete_if_authorized(hash_for_app_instance_path(:id => app_instance).merge(:auth_object => app_instance, :authorizer => authorizer),
-                                                          :data => { 'confirm': _('Delete %s?') % app_instance.name })) %>
-      </td>
+        <%= action_buttons(
+          display_link_if_authorized(_("Deploy"), { :use_route=>"#",
+                                                    :id => app_instance.id,
+                                                    :action => :deploy,
+                                                    :auth_object => app_instance,
+                                                    :controller => :app_instances },
+                                                  :remote => true, 'data-toggle': "modal", 'data-target': "#deploy#{app_instance.id}",
+                                                  :title => _("Deploy application #{app_instance}")),
+          display_link_if_authorized(_("Run Playbook"),
+                                     hash_for_remote_execution_path(:id => app_instance.id),
+                                     :method => :post,
+                                     :title => _("Run ansible playbook for application #{app_instance}")),
+          display_link_if_authorized(_("Run Playbook - customize first"),
+                                     hash_for_remote_execution_path(:id => app_instance.id, :customize => true),
+                                     :method => :post,
+                                     :title => _("Prepare job to run ansible playbook for application #{app_instance}")),
+          display_link_if_authorized(_("Delete"), { :use_route=>"#",
+                                                    :id => app_instance.id,
+                                                    :action => :destroy,
+                                                    :auth_object => app_instance,
+                                                    :controller => :app_instances },
+                                                  :remote => true, 'data-toggle': "modal", 'data-target': "#delete#{app_instance.id}",
+                                                  :title => _("Delete application #{app_instance}"))
+          ) %>
+    </td>
     </tr>
+    <!-- Delete Modal -->
+      <div class="modal fade" id="delete<%=app_instance.id%>" tabindex="-1" role="dialog" aria-labelledby="deleteLabel" aria-hidden="true">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+              <h4 class="modal-title"><%= _('Confirmation Box')%></h4>
+            </div>
+            <div class="modal-body">
+              <p> <%= _("Confirm to delete ") %> <%= app_instance %></p>
+              <%= form_tag destroy_with_hosts_app_instance_path(:id => app_instance.id), :method => :delete do %>
+                <% if app_instance.foreman_hosts.where.not(:host_id => [nil, false]).any? %>
+                  <p><%= _("Select the hosts to delete along with ") %> <%= app_instance %>: </p>
+                <% end %>
+                <% app_instance.foreman_hosts.each do |foreman_host|%>
+                  <% if foreman_host.host_id? %>
+                    <%= check_box_tag 'foreman_host_ids[]', foreman_host.host_id -%>
+                    <%= h foreman_host.host.name -%>
+                    </br>
+                  <% end %>
+                <% end %>
+            </div>
+            <div class="modal-footer">
+               <button type="button" class="btn btn-primary" data-dismiss="modal"><%= _('Cancel') %></button>
+               <%= submit_tag _("Delete"), name: nil, class: "btn btn-danger" %>
+               <% end %>
+            </div>
+          </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+      </div><!-- /.modal -->
+
+      <!-- Deploy Modal -->
+      <div class="modal fade" id="deploy<%=app_instance.id%>" tabindex="-1" role="dialog" aria-labelledby="deployLabel" aria-hidden="true">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+              <h4 class="modal-title"><%= _('Confirmation Box') %></h4>
+            </div>
+            <div class="modal-body">
+              <p><%= _('Confirm to deploy ') %><%= app_instance%></p>
+              <%= form_tag deploy_app_instance_path(:id => app_instance.id), :method => :post do %>
+                <% if app_instance.foreman_hosts.where.not(:host_id => [nil, false]).any? %>
+                  <ul>
+                  <li><%= check_box_tag 'delete_hosts'-%><%= _('Delete all hosts before deploying ') %><%= app_instance%></li>
+                  <li><%= check_box_tag 'safe_deploy' -%><%= _('Deploy only new and changed hosts for ') %><%= app_instance%></li>
+                  </ul>
+                <% end %>
+            </div>
+            <div class="modal-footer">
+               <button type="button" class="btn btn-danger" data-dismiss="modal"><%= _('Cancel') %></button>
+               <%= submit_tag _("Submit"), name: nil, class: "btn btn-success" %>
+               <% end %>
+            </div>
+          </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+     </div><!-- /.modal -->
   <% end %>
 </table>
-
 <%= page_entries_info @app_instances %>
 <%= will_paginate @app_instances %>
-

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

@@ -1,4 +1,4 @@
-<% title _("Deployment Report for Application Instance #{@app_instance}") %>
+<% title _("Provisioning details for application instance #{@app_instance}") %>
 
 <% content_for(:javascripts) do %>
   <%= webpacked_plugins_js_for :foreman_acd %>
@@ -10,10 +10,13 @@
 <%
   json = {
     "mode": 'lastReport',
-    "hosts": @report_hosts
+    "appInstanceName": @app_instance.name,
+    "hosts": @report_hosts,
+    "deployTaskUrl": foreman_tasks_task_path(@app_instance.last_deploy_task),
+    "configureJobUrl": job_invocations_path(search: "description ~ \"ACD application #{@app_instance.name}\"")
   }
 %>
 
 <div id='report'></div>
-  <%=  mount_react_component('ApplicationInstanceReport', "#report", json.to_json) %>
+  <%=  react_component('ApplicationInstanceReport', :data => json) %>
 </div

data/app/views/templates/job/run_acd_ansible_playbook.erb

@@ -0,0 +1,62 @@
+<%#
+kind: job_template
+name: Run ACD Ansible Playbook - ACD Default
+model: JobTemplate
+job_category: Application Centric Deployment
+description_format: "Run Ansible playbook to configure ACD application %{application_name}"
+feature: run_acd_ansible_playbook
+provider_type: ACD
+template_inputs:
+- name: application_name
+  description: The name of the ACD application instance to run
+  input_type: user
+  required: true
+  advanced: false
+- name: playbook_id
+  description: The id of the Ansible playbook to run
+  input_type: user
+  required: true
+  advanced: false
+- name: playbook_file
+  description: The playbook file of to the Ansible playbook
+  input_type: user
+  required: true
+  advanced: false
+- name: inventory
+  description: The Ansible inventory
+  input_type: user
+  required: true
+  advanced: false
+- name: extra_vars
+  description: Set ansible-playbook extra vars
+  input_type: user
+  required: false
+  advanced: true
+- name: verbose
+  description: Whether to run the ansible-playbook in verbose mode or not.
+  input_type: user
+  options: "0 - Normal\n1 - Verbose\n2 - More Verbose\n3 - Debug\n4 - Connection Debug"
+  default: "0 - Normal"
+  required: false
+  advanced: true
+- name: tags
+  description: List of playbook tags to specify which tasks to execute.
+  input_type: user
+  required: false
+  advanced: true
+- name: skip_tags
+  description: List of playbook tags to skip certain tasks.
+  input_type: user
+  required: false
+  advanced: true
+%>
+
+application_name: <%= input('application_name') %>
+playbook_id: <%= input('playbook_id') %>
+playbook_file: <%= input('playbook_file') %>
+extra_vars: <%= input('extra_vars') %>
+verbose: <%= input('verbose') %>
+tags: <%= input('tags') %>
+skip_tags: <%= input('skip_tags') %>
+inventory: |
+<%=  indent(2) { input('inventory') } %>