foreman_ansible 2.2.14 → 2.3.0

data/app/views/ansible_roles/index.html.erb

@@ -18,12 +18,22 @@
       <tr>
         <td class="ellipsis"><%= role.name %></td>
         <td class="ellipsis"><%= role.hostgroups.count %></td>
-        <td class="ellipsis"><%= link_to role.hosts.count, hosts_path(:search => "ansible_role = #{role.name}")%></td>
+        <td class="ellipsis"><%= link_to role.hosts.count, hosts_path(:search => "role = #{role.name}")%></td>
         <td class="ellipsis"><%= import_time role %></td>
         <td>
           <%
-            links = [display_delete_if_authorized(hash_for_ansible_role_path(:id => role).merge(:auth_object => role, :authorizer => authorizer),
-                      :data => { :confirm => _("Delete %s?") % role.name }, :action => :delete)]
+              links = [
+                link_to(
+                  _('Variables'),
+                  ansible_variables_path(:search => "ansible_role = #{role}")
+                ),
+                display_delete_if_authorized(
+                  hash_for_ansible_role_path(:id => role).
+                  merge(:auth_object => role, :authorizer => authorizer),
+                  :data => { :confirm => _("Delete %s?") % role.name },
+                  :action => :delete
+                )
+              ]
           %>
           <%= action_buttons(*links) %>
         </td>

data/app/views/ansible_variables/_ansible_roles_list.html.erb

@@ -0,0 +1,15 @@
+<% if f.object.is_a? ::AnsibleVariable %>
+  <%=
+    select_f(
+      f,
+      :ansible_role_id,
+      [f.object.ansible_role],
+      :id,
+      :to_label,
+      {},
+      { :label => _("Ansible Role"), :disabled => true }
+    )
+  %>
+<% else %>
+  <%= show_puppet_class(f) %>
+<% end %>

data/app/views/ansible_variables/_validator_text.html.erb

@@ -0,0 +1,5 @@
+<% if f.object.is_a? ::AnsibleVariable %>
+  <h6><%= _('Before including these variables on your playbooks, Foreman will validate that your variables comply with the validation.') %></h6>
+<% else %>
+  <h6><%= _('If ERB is used in a parameter value, the validation of the value will happen during the ENC request. If the value is invalid, the ENC request will fail.') %></h6>
+<% end %>

data/app/views/ansible_variables/edit.html.erb

@@ -0,0 +1,17 @@
+<%= breadcrumbs(
+  :items => [
+    {
+      :caption => _('Ansible Variables'),
+      :url => url_for(ansible_variables_path)
+    },
+    {
+      :caption => _('Edit %s' % @ansible_variable.key)
+    }
+  ],
+  :switchable => false
+) %>
+<% title(_('Edit Ansible Variable')) %>
+<%= form_for(@ansible_variable) do |f| %>
+    <%= render 'lookup_keys/fields', :f => f %>
+    <%= submit_or_cancel f %>
+<% end %>

data/app/views/ansible_variables/import.html.erb

@@ -0,0 +1,53 @@
+<% title _("Changed Ansible variables") %>
+<%= form_tag confirm_import_ansible_variables_path do %>
+  <h4><%= _("Select the changes you want to realize in Foreman") %></h4>
+  <h6>
+  <%= _("Toggle") %>:
+  <%= link_to_function(icon_text("check", _("New")),
+                       "toggleCheckboxesBySelector('.variable_select_boxes_new')",
+                       :title => _("Check/Uncheck new")) %> |
+  <%= link_to_function(icon_text("check", _("Obsolete")),
+                       "toggleCheckboxesBySelector('.variable_select_boxes_obsolete')",
+                       :title => _("Check/Uncheck obsolete")) %>
+  </h6>
+  <table class="<%= table_css_classes %>">
+    <thead>
+      <tr>
+        <th class="ca">
+          <%= link_to_function(icon_text("check"),
+                               "toggleCheckboxesBySelector('.variable_select_boxes')",
+                               :title => _("Check/Uncheck all")) %>
+        </th>
+        <th><%= _("Name") %></th>
+        <th><%= _("Ansible role") %></th>
+        <th class="col-md-2"><%= _("Hosts count") %></th>
+        <th class="col-md-2"><%= _("Hostgroups count") %></th>
+        <th><%= _("Operation") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% changed.each do |kind, variables| %>
+        <% variables.each do |variable| %>
+          <tr>
+            <td>
+              <%= check_box_tag "changed[#{kind}][#{variable.ansible_role}][#{variable}]", variable.to_json, false, :class => "variable_select_boxes variable_select_boxes_#{kind} variable_select_boxes_variable_#{variable}" %>
+            </td>
+            <td>
+              <%= link_to_function("#{variable}", "toggleCheckboxesBySelector('.variable_select_boxes_variable_#{variable}')", :title => _("Check/Uncheck all %s changes") % variable) %>
+            </td>
+            <td><%= variable.ansible_role %></td>
+            <td><%= variable.ansible_role.hosts.count %></td>
+            <td><%= variable.ansible_role.hostgroups.count %></td>
+            <td>
+              <%= { "new" => _("Add"), "obsolete" => _("Remove") }[kind] %>
+            </td>
+          </tr>
+        <% end %>
+      <% end %>
+    </tbody>
+  </table>
+  <div>
+    <%= link_to _("Cancel"), ansible_variables_path, :class => "btn btn-default" %>
+    <%= submit_tag _("Update"), :class => "btn btn-primary" %>
+  </div>
+<% end %>

data/app/views/ansible_variables/index.html.erb

@@ -0,0 +1,46 @@
+<% title _("Ansible Variables") %>
+
+<% title_actions ansible_proxy_import(hash_for_import_ansible_variables_path),
+  documentation_button('#4.3Variables', :root_url => ansible_doc_url) %>
+
+<table class="<%= table_css_classes 'table-fixed' %>">
+  <thead>
+    <tr>
+      <th class='col-md-6'><%= sort :name, :as => s_('Variable|Name') %></th>
+      <th class='col-md-2'><%= sort :ansible_role, :as => s_('Variable|Role') %></th>
+      <th class='col-md-2'><%= _('Type') %></th>
+      <th class='col-md-2'><%= _('Actions') %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @ansible_variables.each do |variable| %>
+      <tr>
+        <td class="ellipsis"><%= link_to_if_authorized(
+          variable.key,
+          hash_for_edit_ansible_variable_path(:id => variable).
+          merge(:auth_object => variable,
+                :permission => 'edit_external_parameters',
+                :authorizer => authorizer)
+        ) %></td>
+        <td class="ellipsis"><%= link_to_if_authorized(
+          variable.ansible_role.name,
+          hash_for_ansible_variables_path(:search => "ansible_role = #{variable.ansible_role}")
+        ) %></td>
+        <td class="ellipsis"><%= "String" %></td>
+        <td class="ellipsis">
+          <% links = [
+            display_delete_if_authorized(
+              hash_for_ansible_variable_path(:id => variable.id).merge(
+                :auth_object => variable,
+                :authorizer => authorizer),
+                :data => { :confirm => _("Delete %s?") % variable.key },
+                :action => :delete)
+          ] %>
+          <%= action_buttons(*links) %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= will_paginate_with_info @ansible_variables %>

data/app/views/api/v2/ansible_roles/import.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @imported => :imported
 
 extends 'api/v2/ansible_roles/show'

data/app/views/api/v2/ansible_roles/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @ansible_roles
 
 extends 'api/v2/ansible_roles/show'

data/app/views/api/v2/ansible_roles/obsolete.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @obsoleted => :obsoleted
 
 extends 'api/v2/ansible_roles/show'

data/app/views/api/v2/ansible_roles/show.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @ansible_role
 
 attributes :id, :name, :created_at, :updated_at

data/app/views/api/v2/ansible_variables/import.json.rabl

@@ -0,0 +1,3 @@
+collection @imported => :imported
+
+extends 'api/v2/ansible_variables/show'

data/app/views/api/v2/ansible_variables/index.json.rabl

@@ -0,0 +1,3 @@
+collection @ansible_variables
+
+extends 'api/v2/ansible_variables/show'

data/app/views/api/v2/ansible_variables/obsolete.json.rabl

@@ -0,0 +1,3 @@
+collection @obsoleted => :obsoleted
+
+extends 'api/v2/ansible_variables/show'

data/app/views/api/v2/ansible_variables/show.json.rabl

@@ -0,0 +1,20 @@
+object @ansible_variable
+
+attribute :parameter
+attributes :id, :ansible_role, :description, :override, :parameter_type,
+           :hidden_value?, :omit, :required, :validator_type, :validator_rule,
+           :merge_overrides, :merge_default, :avoid_duplicates,
+           :override_value_order, :created_at, :updated_at
+
+node do |ansible_variable|
+  {
+    :override_values => partial(
+      'api/v2/override_values/index',
+      :object => ansible_variable.lookup_values
+    )
+  }
+end
+
+node :override_values_count do |lk|
+  lk.lookup_values.count
+end

data/app/views/foreman_ansible/api/v2/ansible_roles/import.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @imported => :imported
 
 extends 'api/v2/ansible_roles/show'

data/app/views/foreman_ansible/api/v2/ansible_roles/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @ansible_roles
 
 extends 'api/v2/ansible_roles/show'

data/app/views/foreman_ansible/api/v2/ansible_roles/obsolete.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @obsoleted => :obsoleted
 
 extends 'api/v2/ansible_roles/show'

data/app/views/foreman_ansible/api/v2/ansible_roles/show.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @ansible_role
 
 attributes :name, :created_at, :updated_at

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable BlockLength
 Rails.application.routes.draw do
   namespace :api do
@@ -47,6 +49,14 @@ Rails.application.routes.draw do
     end
 
     resources :ansible_roles, :only => [:index, :destroy] do
+      collection do
+        get :import
+        post :confirm_import
+      end
+    end
+
+    resources :ansible_variables, :except => [:show, :new, :create] do
+      resources :lookup_values, :only => [:index, :create, :update, :destroy]
       collection do
         get :import
         post :confirm_import
@@ -68,6 +78,13 @@ Rails.application.routes.draw do
             get :fetch
           end
         end
+
+        resources :ansible_variables, :only => [:show, :index, :destroy] do
+          collection do
+            put :import
+            put :obsolete
+          end
+        end
       end
     end
   end

data/db/migrate/20160705082036_create_ansible_role.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Creates simple model of Ansible Role
 class CreateAnsibleRole < ActiveRecord::Migration[4.2]
   def change

data/db/migrate/20160706074540_create_join_table_hosts_ansible_roles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Defines the relation between Host and AnsibleRole
 class CreateJoinTableHostsAnsibleRoles < ActiveRecord::Migration[4.2]
   def change

data/db/migrate/20160707195442_create_host_ansible_roles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Renames join table between Host and Ansible Roles
 class CreateHostAnsibleRoles < ActiveRecord::Migration[4.2]
   def change

data/db/migrate/20160729094457_add_columns_to_ansible_role.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # to keep track of when the roles were imported
 class AddColumnsToAnsibleRole < ActiveRecord::Migration[4.2]
   def up

data/db/migrate/20160802153302_create_join_table_hostgroup_ansible_roles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Defines the relation between Hostgroup and AnsibleRole
 # rubocop:disable Metrics/LineLength
 class CreateJoinTableHostgroupAnsibleRoles < ActiveRecord::Migration[4.2]

data/db/migrate/20160805094233_add_primary_key_hostgroup_ansible_roles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Adds primary key to join table between Hostgroup and Ansible Role
 class AddPrimaryKeyHostgroupAnsibleRoles < ActiveRecord::Migration[4.2]
   def change

data/db/migrate/20161122154057_automatically_set_role_timestamps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Creation and updates timestamps for Ansible Roles
 class AutomaticallySetRoleTimestamps < ActiveRecord::Migration[4.2]
   def up

data/db/migrate/20180410125416_rename_ansible_job_categories.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
+# Rename ansible job categories migration
 class RenameAnsibleJobCategories < ActiveRecord::Migration[5.1]
   def up
-    unless User.unscoped.find_by_login(User::ANONYMOUS_ADMIN)
-      puts "No ANONYMOUS_ADMIN found. Skipping renaming Ansible jobs"
+    unless User.unscoped.find_by(:login => User::ANONYMOUS_ADMIN)
+      STDOUT.puts 'No ANONYMOUS_ADMIN found. Skipping renaming Ansible jobs'
       return
     end
     User.as_anonymous_admin do
@@ -16,7 +19,7 @@ class RenameAnsibleJobCategories < ActiveRecord::Migration[5.1]
           job_template.job_category = "Ansible #{job_template.job_category}"
           job_template.save
         end
-  
+
         service_template = JobTemplate.where(
           :name => 'Service Action - Ansible Default'
         ).first

data/db/migrate/20180628125416_add_ansible_role_id_to_lookup_keys.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# to keep track of when the roles were imported
+class AddAnsibleRoleIdToLookupKeys < ActiveRecord::Migration[4.2]
+  def up
+    add_column :lookup_keys, :ansible_role_id, :integer
+    add_index :lookup_keys, :ansible_role_id
+  end
+
+  def down
+    remove_index :lookup_keys, :ansible_role_id
+    remove_column :lookup_keys, :ansible_role_id
+  end
+end

data/db/seeds.d/62_ansible_proxy_feature.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 proxy_feature = Feature.where(:name => 'Ansible').first_or_create
 if proxy_feature.nil? || proxy_feature.errors.any?
   raise "Unable to create proxy feature: #{format_errors proxy_feature}"

data/db/seeds.d/75_job_templates.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 organizations = Organization.unscoped.all
 locations = Location.unscoped.all
 User.as_anonymous_admin do
   RemoteExecutionFeature.without_auditing do
-    if Rails.env.test? || File.basename($PROGRAM_NAME) == 'rake'
+    if Rails.env.test? || Foreman.in_rake?
       # If this file tries to import a template with a REX feature in a SeedsTest,
       # it will fail - the REX feature isn't registered on SeedsTest because
       # DatabaseCleaner truncates the db before every test.

data/db/seeds.d/90_notification_blueprints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 blueprints = [
   {
     :group => N_('Jobs'),

data/lib/foreman_ansible.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'foreman-tasks'
 require 'foreman_ansible/engine'
 

data/lib/foreman_ansible/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'deface'
 require 'fast_gettext'
 require 'gettext_i18n_rails'

data/lib/foreman_ansible/register.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable BlockLength
 Foreman::Plugin.register :foreman_ansible do
   requires_foreman '>= 1.16'
@@ -14,7 +16,7 @@ Foreman::Plugin.register :foreman_ansible do
                                           :multiple_play_roles] },
                :resource_type => 'Hostgroup'
     permission :view_ansible_roles,
-               { :ansible_roles => [:index, :auto_complete_search],
+               { :ansible_roles => [:index],
                  :'api/v2/ansible_roles' => [:index, :show, :fetch] },
                :resource_type => 'AnsibleRole'
     permission :destroy_ansible_roles,
@@ -25,6 +27,27 @@ Foreman::Plugin.register :foreman_ansible do
                { :ansible_roles => [:import, :confirm_import],
                  :'api/v2/ansible_roles' => [:import] },
                :resource_type => 'AnsibleRole'
+    permission :view_ansible_variables,
+               {
+                 :ansible_variables => [:index, :auto_complete_search],
+                 :'api/v2/ansible_variables' => [:index, :show]
+               },
+               :resource_type => 'AnsibleVariable'
+    permission :edit_ansible_variables,
+               { :ansible_variables => [:edit, :update] },
+               :resource_type => 'AnsibleVariable'
+    permission :destroy_ansible_variables,
+               {
+                 :ansible_variables => [:destroy],
+                 :'api/v2/ansible_variables' => [:destroy, :obsolete]
+               },
+               :resource_type => 'AnsibleVariable'
+    permission :import_ansible_variables,
+               {
+                 :ansible_variables => [:import, :confirm_import],
+                 :'api/v2/ansible_variables' => [:import]
+               },
+               :resource_type => 'AnsibleVariable'
     permission :view_hosts,
                { :'api/v2/hosts' => [:ansible_roles] },
                :resource_type => 'Host'
@@ -52,6 +75,10 @@ Foreman::Plugin.register :foreman_ansible do
        :caption => N_('Roles'),
        :url_hash => { :controller => :ansible_roles, :action => :index },
        :parent => :configure_menu
+  menu :top_menu, :ansible_variables,
+       :caption => N_('Variables'),
+       :url_hash => { :controller => :ansible_variables, :action => :index },
+       :parent => :configure_menu
 
   apipie_documented_controllers [
     "#{ForemanAnsible::Engine.root}/app/controllers/api/v2/*.rb"