foreman_ansible 2.3.0 → 2.3.1

data/locale/zh_TW/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 2.2.6\n"
+"Project-Id-Version: foreman_ansible 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -50,6 +50,9 @@ msgstr ""
 msgid "Ansible role"
 msgstr ""
 
+msgid "Ansible role names to import"
+msgstr ""
+
 msgid "Ansible support in Foreman"
 msgstr ""
 
@@ -98,6 +101,12 @@ msgstr ""
 msgid "Could not run Ansible roles for %{host}"
 msgstr ""
 
+msgid "Create an override value for a specific ansible variable"
+msgstr ""
+
+msgid "Default value of variable"
+msgstr ""
+
 msgid "Default verbosity level"
 msgstr ""
 
@@ -110,6 +119,12 @@ msgstr ""
 msgid "Deletes Ansible variable"
 msgstr ""
 
+msgid "Description of variable"
+msgstr ""
+
+msgid "Destroy an override value"
+msgstr ""
+
 msgid "Disable host configuration status turning to out of sync for %{cfgmgmt} after report does not arrive within configured interval"
 msgstr ""
 
@@ -128,6 +143,9 @@ msgstr ""
 msgid "Error loading data from proxy"
 msgstr ""
 
+msgid "Fetch Ansible roles available to be imported"
+msgstr ""
+
 msgid "Foreman"
 msgstr ""
 
@@ -155,6 +173,12 @@ msgstr ""
 msgid "IDs of associated ansible roles"
 msgstr ""
 
+msgid "IDs of hostgroups to play roles on"
+msgstr ""
+
+msgid "IDs of hosts to play roles on"
+msgstr ""
+
 msgid "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."
 msgstr ""
 
@@ -185,6 +209,9 @@ msgstr ""
 msgid "Imported at"
 msgstr ""
 
+msgid "Include default value when merging all matching values"
+msgstr ""
+
 msgid "Insights remediation on %{hosts_count} host(s) has finished successfully"
 msgstr ""
 
@@ -218,6 +245,15 @@ msgstr ""
 msgid "List Ansible variables"
 msgstr ""
 
+msgid "List all Ansible roles for a host"
+msgstr ""
+
+msgid "List all Ansible roles for a hostgroup"
+msgstr ""
+
+msgid "Merge all matching values (only array/hash type)"
+msgstr ""
+
 msgid "Message"
 msgstr ""
 
@@ -227,6 +263,9 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+msgid "Name of variable"
+msgstr ""
+
 msgid "Nest"
 msgstr ""
 
@@ -262,6 +301,12 @@ msgstr ""
 msgid "Operation"
 msgstr ""
 
+msgid "Override match"
+msgstr ""
+
+msgid "Override value, required if omit is false"
+msgstr ""
+
 msgid "Play Ansible roles"
 msgstr ""
 
@@ -301,6 +346,12 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+msgid "Remove duplicate values (only array type)"
+msgstr ""
+
+msgid "Role ID"
+msgstr ""
+
 msgid "Roles"
 msgstr ""
 
@@ -325,9 +376,18 @@ msgstr ""
 msgid "Show variable"
 msgstr ""
 
+msgid "Smart Proxy to fetch from"
+msgstr ""
+
 msgid "Smart Proxy to import from"
 msgstr ""
 
+msgid "The order in which values are resolved"
+msgstr ""
+
+msgid "There are no Ansible roles to play"
+msgstr ""
+
 msgid "This list of roles will be applied when the host finishes<br/> provisioning. Users can also play these roles through the API<br/>or by clicking on the Play Roles button on the Host page "
 msgstr ""
 
@@ -346,6 +406,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+msgid "Types of validation values"
+msgstr ""
+
+msgid "Types of variable values"
+msgstr ""
+
 msgid "Unable to get roles from Ansible"
 msgstr ""
 
@@ -355,12 +421,18 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
+msgid "Updates Ansible variable"
+msgstr ""
+
 msgid "Use this connection type by default when running Ansible playbooks. You can override this on hosts by adding a parameter \"ansible_connection\""
 msgstr ""
 
 msgid "Use this to supply a path to an SSH Private Key that Ansible will use in lieu of a password Override with \"ansible_ssh_private_key_file\" host parameter"
 msgstr ""
 
+msgid "Used to enforce certain values for the parameter values"
+msgstr ""
+
 msgid "Variables"
 msgstr ""
 
@@ -370,7 +442,10 @@ msgstr ""
 msgid "Variable|Role"
 msgstr ""
 
-msgid "Whether to put Ansible parameters in the \"hostvars\" top-level key of the inventory. By default it is true, so that Host Parameters can be used directly in the playbooks.When false, Host Parameters can only be accessed throughforeman_params[\"host_parameter\"] in the playbooks."
+msgid "When enabled the parameter is hidden in the UI"
+msgstr ""
+
+msgid "Whether to put Ansible parameters in the \"hostvars\" top-level key of the inventory. By default it is true, so that Host Parameters can be used directly in the playbooks. When false, Host Parameters can only be accessed through foreman_params[\"host_parameter\"] in the playbooks."
 msgstr ""
 
 msgid "WinRM cert Validation"

data/test/functional/api/v2/ansible_roles_controller_test.rb

@@ -45,13 +45,14 @@ module Api
           }, :session => set_session_user
           assert_response :success
         end
-      end
-
-      test 'should fetch' do
-        get :fetch, :session => set_session_user
-        response = JSON.parse(@response.body)
-        refute_empty response['results']
-        assert_response :success
+        test 'should fetch' do
+          get :fetch, :params => {
+            :proxy_id => @proxy.id
+          }, :session => set_session_user
+          response = JSON.parse(@response.body)
+          assert_not_empty response['results']
+          assert_response :success
+        end
       end
     end
   end

data/test/unit/services/fact_parser_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'test_plugin_helper'
 
 module ForemanAnsible
   # Checks sample Ansible facts to see if it can assign them to
@@ -122,9 +123,12 @@ module ForemanAnsible
     end
 
     test 'Parses debian unstable aka sid correctly' do
-      os = @facts_parser.operatingsystem
-      assert_equal '10', os.major
-      assert_equal 'Debian', os.name
+      as_admin do
+        os = @facts_parser.operatingsystem
+
+        assert_equal '10', os.major
+        assert_equal 'Debian', os.name
+      end
     end
   end
 

data/test/unit/services/inventory_creator_test.rb

@@ -10,7 +10,8 @@ module ForemanAnsible
     setup do
       @host = FactoryBot.build(:host)
       @template_invocation = OpenStruct.new(
-        :job_invocation => OpenStruct.new(:password => 'foobar'),
+        :job_invocation => OpenStruct.new(:password => 'foobar',
+					 :sudo_password => 'foobar'),
         :effective_user => 'foobar'
       )
     end
@@ -30,6 +31,7 @@ module ForemanAnsible
     end
 
     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
@@ -41,6 +43,8 @@ module ForemanAnsible
         returns('root').at_least_once
       Setting.expects(:[]).with('remote_execution_ssh_password').
         returns('asafepassword').at_least_once
+      Setting.expects(:[]).with('remote_execution_sudo_password').
+        returns('foobar').at_least_once
       Setting.expects(:[]).with('ansible_winrm_server_cert_validation').
         returns(true).at_least_once
       Setting.expects(:[]).with('ansible_connection').
@@ -69,6 +73,8 @@ module ForemanAnsible
                    connection_params['ansible_port']
       assert_equal Setting['remote_execution_ssh_password'],
                    connection_params['ansible_ssh_pass']
+      assert_equal Setting['remote_execution_sudo_password'],
+                   connection_params['ansible_sudo_pass']
       assert_equal Setting['ansible_winrm_server_cert_validation'],
                    connection_params['ansible_winrm_server_cert_validation']
     end
@@ -80,8 +86,16 @@ module ForemanAnsible
                    inventory.rex_ssh_password(@host))
     end
 
+    test 'job invocation sudo password is passed when available' do
+      inventory = ForemanAnsible::InventoryCreator.new(@host,
+                                                       @template_invocation)
+      assert_equal(@template_invocation.job_invocation.sudo_password,
+                   inventory.rex_sudo_password(@host))
+    end
+
     test 'ssh private key is passed when available' do
       host = FactoryBot.build(:host)
+      AnsibleProvider.stubs(:find_ip_or_hostname).with(host).returns(host.name)
       path_to_key = '/path/to/private/key'
       inventory = ForemanAnsible::InventoryCreator.new(host,
                                                        @template_invocation)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -120,8 +120,10 @@ files:
 - app/assets/stylesheets/foreman_ansible/foreman-ansible.css
 - app/controllers/ansible_roles_controller.rb
 - app/controllers/ansible_variables_controller.rb
+- app/controllers/api/v2/ansible_override_values_controller.rb
 - app/controllers/api/v2/ansible_roles_controller.rb
 - app/controllers/api/v2/ansible_variables_controller.rb
+- app/controllers/concerns/foreman/controller/parameters/ansible_override_value.rb
 - app/controllers/concerns/foreman/controller/parameters/ansible_variable.rb
 - app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb
 - app/controllers/foreman_ansible/api/v2/hostgroups_param_group_extensions.rb
@@ -177,10 +179,12 @@ files:
 - app/views/ansible_variables/edit.html.erb
 - app/views/ansible_variables/import.html.erb
 - app/views/ansible_variables/index.html.erb
+- app/views/api/v2/ansible_override_values/show.json.rabl
 - app/views/api/v2/ansible_roles/import.json.rabl
 - app/views/api/v2/ansible_roles/index.json.rabl
 - app/views/api/v2/ansible_roles/obsolete.json.rabl
 - app/views/api/v2/ansible_roles/show.json.rabl
+- app/views/api/v2/ansible_variables/destroy.json.rabl
 - app/views/api/v2/ansible_variables/import.json.rabl
 - app/views/api/v2/ansible_variables/index.json.rabl
 - app/views/api/v2/ansible_variables/obsolete.json.rabl