foreman_ansible 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93abbabed7119b4567e837415bee3a5e25a043b9267499cdfa6b45e27d1352d4
-  data.tar.gz: 5f7a23457ea9bd84adcb6ff1769e7c8d679e4dd907cd0fe43798fad55002b560
+  metadata.gz: a373c417d10ac003b1ef65a607ecbef52965a0342c71b93b5cb5280556375ca4
+  data.tar.gz: ccf7c205d0c30ec2fe8125d527045a94617f44d625cb5be41d64cb836c8cb5f3
 SHA512:
-  metadata.gz: 3cd8e665ed9e8d157664596130d6ece62f05921fa7073ce3e901716378ebddcf5855b082a79a3d0c8df65382fdb68d905938ad1d4f9541b5af5d88918770d78f
-  data.tar.gz: 2b558e206a05a33726c73d1b367eece0a74e7f0eaaa6fe8f7a2a339097471b6d3a5500abdbacdbc18bc51d9f305972c71d3255a2fd28733d9875781df6046834
+  metadata.gz: '09fdb9dd6193c49a4934242867611b3ae2b72abca9c5cd24053d19d64ee8ff6785f44b672171e239660366e595211008461f5da7e9cf0859a20d7ab7a85eff3c'
+  data.tar.gz: 57fc874d5005e7949f2d264a506f0217a962b3b374eba0ecb6228fe8e041db277b114fda4f262b2bbfd43637eb66ef89d711de11b4fb6886bdb9a60e70dd12ac

data/app/controllers/api/v2/ansible_inventories_controller.rb

@@ -3,6 +3,11 @@ module Api
     class AnsibleInventoriesController < ::Api::V2::BaseController
       include ::Api::Version2
 
+      resource_description do
+        api_version 'v2'
+        api_base_url '/ansible/api'
+      end
+
       api :POST, '/ansible_inventories/hosts',
           N_('Show Ansible inventory for hosts')
       param :host_ids, Array, N_('IDs of hosts included in inventory'),
@@ -13,6 +18,10 @@ module Api
       param :host_ids, Array, N_('IDs of hosts included in inventory'),
             :required => true
 
+      def hosts
+        show_inventory :host_ids, :id
+      end
+
       api :POST, '/ansible_inventories/hostgroups',
           N_('Show Ansible inventory for hostgroups')
       param :hostgroup_ids, Array, N_('IDs of hostgroups included in inventory'),
@@ -23,10 +32,6 @@ module Api
       param :hostgroup_ids, Array, N_('IDs of hostgroups included in inventory'),
             :required => true
 
-      def hosts
-        show_inventory :host_ids, :id
-      end
-
       def hostgroups
         show_inventory :hostgroup_ids, :hostgroup_id
       end

data/app/services/foreman_ansible/ansible_info.rb

@@ -10,7 +10,7 @@ module ForemanAnsible
 
       variables.each_with_object({}) do |var, memo|
         value = values[var]
-        memo[var.key] = value if value
+        memo[var.key] = value unless value.nil?
         memo
       end
     end

data/app/views/ansible_variables/_fields.erb

@@ -15,7 +15,7 @@
         ) %>
 
     <% version = Foreman::Version.new %>
-    <% if version.major.to_i >= 1 && version.minor.to_i >= 22 %>
+    <% if version.major.to_i > 1 || version.minor.to_i >= 22 %>
       <%= param_type_selector(f, false, :onchange => 'keyTypeChange(this)', :disabled => !f.object.override) %>
     <% else %>
       <%= param_type_selector(f, :onchange => 'keyTypeChange(this)', :disabled => !f.object.override) %>

data/app/views/foreman_ansible/job_templates/ansible_roles_-_ansible_default.erb

@@ -15,7 +15,10 @@ model: JobTemplate
     - name: Display all parameters known for the Foreman host
       debug:
         var: foreman
-  roles:
-<%- if @host.all_ansible_roles.present? -%>
-<%=   @host.all_ansible_roles.map { |role| "    - #{role.name.strip}" }.join("\n") %>
-<%- end -%>
+  tasks:
+    - name: Apply roles
+      include_role:
+        name: "{{ role }}"
+      loop: "{{ foreman_ansible_roles }}"
+      loop_control:
+        loop_var: role

data/app/views/foreman_ansible/job_templates/connect_red_hat_receptor_controller_-_ansible_default.erb

@@ -0,0 +1,26 @@
+<%#
+name: Connect Red Hat receptor controller
+snippet: false
+template_inputs:
+- name: satellite_user
+  required: true
+  input_type: user
+  advanced: false
+  value_type: plain
+- name: satellite_password
+  required: true
+  input_type: user
+  advanced: false
+  value_type: plain
+model: JobTemplate
+job_category: Ansible Playbook
+provider_type: Ansible
+kind: job_template
+%>
+
+---
+- hosts: all
+  vars:
+    satellite_url: "<%= foreman_server_url %>"
+  roles:
+    - satellite-receptor

data/config/routes.rb

@@ -72,7 +72,7 @@ Rails.application.routes.draw do
             :module => :v2,
             :defaults => { :apiv => 'v2' },
             :apiv => /v1|v2/,
-            :constraints => ApiConstraints.new(:version => 2) do
+            :constraints => ApiConstraints.new(:version => 2, :default => true) do
         resources :ansible_roles, :only => [:show, :index, :destroy] do
           collection do
             put :import

data/lib/foreman_ansible/version.rb

@@ -4,5 +4,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '5.0.0'
+  VERSION = '5.0.1'
 end

data/test/unit/services/inventory_creator_test.rb

@@ -32,8 +32,6 @@ module ForemanAnsible
     test 'settings are respected if param cannot be found' do
       AnsibleProvider.stubs(:find_ip_or_hostname).with(@host).returns(@host.name)
       extra_options = { 'ansible_user' => 'someone', 'ansible_port' => 2000 }
-      Setting.expects(:[]).with('Enable_Smart_Variables_in_ENC').
-        returns(nil).at_least_once
       Setting.expects(:[]).with('ansible_ssh_private_key_file').
         returns(nil).at_least_once
       Setting.expects(:[]).with('remote_execution_ssh_port').

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -186,6 +186,7 @@ files:
 - app/views/foreman_ansible/job_templates/ansible_roles_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_galaxy.erb
 - app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_git.erb
+- app/views/foreman_ansible/job_templates/connect_red_hat_receptor_controller_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/maintenance_plan.erb
 - app/views/foreman_ansible/job_templates/module_action_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/package_action_-_ansible_default.erb