foreman_ansible 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2399ebe8fda7c442e3d7237e348679a9f7d5e09b
-  data.tar.gz: 10e83333e39d2dce97bb61682d3e4febedeccee6
+  metadata.gz: de6e79123f688c3553272ed001f1083956294a83
+  data.tar.gz: 943ccf987f9f2069fa51065eb3f44ded9cbefcf2
 SHA512:
-  metadata.gz: 1b0898d563f521e97dbb742c86e85c51a83662fd0309b7be06a635980c01c734292c2c50ae1bb891394452a9a34c3cd7ae535c92c1a4774ecbe0777b97a8a388
-  data.tar.gz: 3043d427ef9a4388c8eda9e07005e644ef03dfd1f3b84f15778f7df7a6748aef1491c522e2fd379b3505ae0a9b287095230f753d9e209d3a66dab865e3331492
+  metadata.gz: 60c9771a89b91400ec87794ac3b907cf67417d86aee5b32d80f697544aa3537cc09c65e6c290c34eca2862642c72947bcf4dae0a0ff842fafafe52381b329b93
+  data.tar.gz: 9100e43f728698c4c60a657d6cf252ae045505d82d9d8bebe1dccd7430f405e262ce186ef843f8fdb4d8b0932c84bb39a2d77ad0420c5bd01092fc8b5008d318

data/app/models/setting/ansible.rb

@@ -0,0 +1,18 @@
+class Setting::Ansible < ::Setting
+  def self.load_defaults
+    return unless super
+    self.transaction do
+      [
+        self.set('ansible_port', N_('Foreman will use this port to ssh into hosts for running playbooks'), 22, N_('Default port')),
+        self.set('ansible_user', N_('Foreman will try to connect as this user to hosts when running Ansible playbooks.'), 'root', N_('Default user')),
+        self.set('ansible_ssh_pass', N_('Foreman will use this password when running Ansible playbooks.'), 'ansible', N_('Default password'))
+      ].compact.each { |s| self.create s.update(:category => 'Setting::Ansible') }
+    end
+
+    true
+  end
+
+  def self.humanized_category
+    N_('Ansible')
+  end
+end

data/app/services/foreman_ansible/fact_importer.rb

@@ -2,13 +2,19 @@ module ForemanAnsible
   # Override methods from Foreman app/services/fact_importer so that Ansible
   # facts are recognized in Foreman as ForemanAnsible facts. It supports
   # nested facts.
+  #
+  # Only relevant for 1.12 and lower versions
   class FactImporter < ::FactImporter
     def fact_name_class
       ForemanAnsible::FactName
     end
 
     def initialize(host, facts = {})
-      @host = host
+      # Try to assign these facts to the correct host as per the facts say
+      # If that host isn't created yet, the host parameter will contain it
+      @host = Host.find_by(:name => facts[:ansible_facts][:ansible_fqdn] ||
+                                    facts[:ansible_facts][:fqdn]) ||
+              host
       @facts = normalize(facts[:ansible_facts])
       @original_facts = FactSparser.unsparse(facts[:ansible_facts])
       @counters = {}

data/app/services/foreman_ansible/fact_parser.rb

@@ -23,12 +23,13 @@ module ForemanAnsible
 
     def model
       name = detect_fact([:ansible_product_name, :facter_virtual,
-                          :facter_productname, :facter_model])
+                          :facter_productname, :facter_model, :model])
       Model.where(:name => name.strip).first_or_create unless name.blank?
     end
 
     def domain
-      name = detect_fact([:ansible_domain, :facter_domain, :ohai_domain])
+      name = detect_fact([:ansible_domain, :facter_domain,
+                          :ohai_domain, :domain])
       Domain.where(:name => name).first_or_create unless name.blank?
     end
 
@@ -48,7 +49,7 @@ module ForemanAnsible
       if pref.present?
         (facts[:ansible_interfaces] - [pref]).unshift(pref)
       else
-        facts[:ansible_interfaces].sort
+        (facts[:ansible_interfaces].sort unless facts[:ansible_interfaces].nil?) || []
       end
     end
 
@@ -75,7 +76,8 @@ module ForemanAnsible
 
     def os_major
       facts[:ansible_distribution_major_version] ||
-        facts[:ansible_lsb] && facts[:ansible_lsb]['major_release']
+        facts[:ansible_lsb] && facts[:ansible_lsb]['major_release'] ||
+        (facts[:version].split('R')[0] if os_name == 'junos')
     end
 
     def os_release
@@ -84,7 +86,8 @@ module ForemanAnsible
     end
 
     def os_minor
-      _, minor = os_release.split('.')
+      _, minor = (os_release.split('.') unless os_release.nil?) ||
+                 (facts[:version].split('R') if os_name == 'junos')
       minor || ''
     end
 

data/app/services/foreman_ansible/inventory_creator.rb

@@ -17,18 +17,36 @@ module ForemanAnsible
     # with all hosts.
     def to_hash
       { 'all' => { 'hosts' => hosts.map(&:fqdn) },
-        '_meta' => { 'hostvars' => host_vars } }
+        '_meta' => { 'hostvars' => hosts_vars } }
     end
 
-    def host_vars
+    def hosts_vars
       hosts.reduce({}) do |hash, host|
-        hash.update(host.fqdn =>
-                    { 'foreman' => host_attributes(host),
-                      'foreman_params' => host_params(host),
-                      'foreman_ansible_roles' => host_roles(host) })
+        hash.update(host.fqdn => host_vars(host))
       end
     end
 
+    def host_vars(host)
+      {
+        'foreman' => host_attributes(host),
+        'foreman_params' => host_params(host),
+        'foreman_ansible_roles' => host_roles(host)
+      }.merge(connection_params(host))
+    end
+
+    def connection_params(host)
+      params = {
+        'ansible_port' => host_port(host),
+        'ansible_user' => host_user(host),
+        'ansible_ssh_pass' => host_ssh_pass(host)
+      }
+
+      #Backward compatibility for Ansible 1.x
+      params['ansible_ssh_port'] = params['ansible_port']
+      params['ansible_ssh_user'] = params['ansible_user']
+      params
+    end
+
     def host_roles(host)
       host.all_ansible_roles.map(&:name)
     end
@@ -41,6 +59,18 @@ module ForemanAnsible
       host.host_params
     end
 
+    def host_port(host)
+      host.host_params['ansible_port'] || Setting[:ansible_port]
+    end
+
+    def host_user(host)
+      host.host_params['ansible_user'] || Setting[:ansible_user]
+    end
+
+    def host_ssh_pass(host)
+      host.host_params['ansible_ssh_port'] || Setting[:ansible_ssh_pass]
+    end
+
     private
 
     def render_rabl(host, template)

data/app/services/foreman_ansible/structured_fact_importer.rb

@@ -0,0 +1,19 @@
+module ForemanAnsible
+  # On 1.13+ , use the parser for structured facts (like Facter 2) that comes
+  # from core
+  class StructuredFactImporter < ::StructuredFactImporter
+    def fact_name_class
+      ForemanAnsible::FactName
+    end
+
+    def initialize(host, facts = {})
+      # Try to assign these facts to the correct host as per the facts say
+      # If that host isn't created yet, the host parameter will contain it
+      @host = Host.find_by(:name => facts[:ansible_facts][:ansible_fqdn] ||
+                                    facts[:ansible_facts][:fqdn]) ||
+              host
+      @facts = normalize(facts[:ansible_facts])
+      @counters = {}
+    end
+  end
+end

data/db/migrate/20161122154057_automatically_set_role_timestamps.rb

@@ -0,0 +1,11 @@
+class AutomaticallySetRoleTimestamps < ActiveRecord::Migration
+  def up
+    change_column :ansible_roles, :created_at, :datetime, :null => true, :default => nil
+    change_column :ansible_roles, :updated_at, :datetime, :null => true, :default => nil
+  end
+
+  def down
+    change_column :ansible_roles, :created_at, :datetime, :null => false, :default => Time.now.utc
+    change_column :ansible_roles, :updated_at, :datetime, :null => false, :default => Time.now.utc
+  end
+end

data/lib/foreman_ansible/engine.rb

@@ -9,12 +9,19 @@ module ForemanAnsible
     engine_name 'foreman_ansible'
 
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
+    config.autoload_paths += Dir["#{config.root}/app/models"]
     config.autoload_paths += Dir["#{config.root}/app/helpers"]
     config.autoload_paths += Dir["#{config.root}/app/overrides"]
     config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/app/views"]
     config.autoload_paths += Dir["#{config.root}/app/lib"]
 
+    initializer 'foreman_ansible.load_default_settings',
+                :before => :load_config_initializers do
+      require_dependency(File.join(ForemanAnsible::Engine.root,
+                                   'app/models/setting/ansible.rb'))
+    end
+
     initializer 'foreman_ansible.register_gettext',
                 :after => :load_config_initializers do
       locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
@@ -30,7 +37,7 @@ module ForemanAnsible
         security_block :foreman_ansible do
           permission :play_roles,
                      { :hosts => [:play_roles, :multiple_play_roles] },
-                     :resource_type => 'Host::Managed'
+                     :resource_type => 'Host'
           permission :view_ansible_roles,
                      { :ansible_roles => [:index],
                        :'api/v2/ansible_roles' => [:index, :show] },
@@ -45,6 +52,10 @@ module ForemanAnsible
                      :resource_type => 'AnsibleRole'
         end
 
+        role 'Ansible Roles Manager',
+             [:play_roles, :view_ansible_roles, :destroy_ansible_roles,
+              :import_ansible_roles]
+
         role_assignment_params = { :ansible_role_ids => [],
                                    :ansible_roles => [] }
         parameter_filter Host::Managed, role_assignment_params
@@ -57,7 +68,8 @@ module ForemanAnsible
              :parent => :configure_menu
 
         apipie_documented_controllers [
-          "#{ForemanAnsible::Engine.root}/app/controllers/api/v2/*.rb"]
+          "#{ForemanAnsible::Engine.root}/app/controllers/api/v2/*.rb"
+        ]
       end
     end
 
@@ -83,8 +95,17 @@ module ForemanAnsible
 
     config.to_prepare do
       begin
-        ::FactImporter.register_fact_importer(:ansible,
-                                              ForemanAnsible::FactImporter)
+        foreman_version = ::Foreman::Version.new
+        if Rails.env.test? ||
+           foreman_version.major.to_i == 1 && foreman_version.minor.to_i < 13
+          ::FactImporter.register_fact_importer(:ansible,
+                                                ForemanAnsible::FactImporter)
+        else
+          ::FactImporter.register_fact_importer(
+            :ansible,
+            ForemanAnsible::StructuredFactImporter
+          )
+        end
         ::FactParser.register_fact_parser(:ansible, ForemanAnsible::FactParser)
         ::Host::Managed.send(:include, ForemanAnsible::HostManagedExtensions)
         ::Hostgroup.send(:include, ForemanAnsible::HostgroupExtensions)

data/lib/foreman_ansible/version.rb

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

data/test/unit/services/structured_fact_importer_test.rb

@@ -0,0 +1,28 @@
+require 'test_plugin_helper'
+
+module ForemanAnsible
+  # Test for the structured facts importer - its code mostly lives in Foreman
+  # core, so only details have to be tested here.
+  class StructuredFactImporterTest < ActiveSupport::TestCase
+    test 'if host is not in Foreman, use hostname provided by call' do
+      fake_host = Host.new(:name => 'fake')
+      importer = ForemanAnsible::StructuredFactImporter.new(
+        fake_host,
+        facts_json
+      )
+      assert_equal fake_host, importer.send(:host)
+    end
+
+    test 'if host is in Foreman, use hostname provided by Ansible' do
+      ansible_fqdn_host = FactoryGirl.build(:host)
+      ansible_fqdn_host.name = facts_json[:ansible_facts][:ansible_fqdn]
+      ansible_fqdn_host.save
+      importer = ForemanAnsible::StructuredFactImporter.new(
+        Host.new(:name => 'fake'),
+        facts_json
+      )
+
+      assert_equal ansible_fqdn_host, importer.send(:host)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -108,6 +108,7 @@ files:
 - app/models/foreman_ansible/fact_name.rb
 - app/models/host_ansible_role.rb
 - app/models/hostgroup_ansible_role.rb
+- app/models/setting/ansible.rb
 - app/overrides/ansible_roles_tab.rb
 - app/overrides/hostgroup_ansible_roles_tab.rb
 - app/overrides/report_output.rb
@@ -119,6 +120,7 @@ files:
 - app/services/foreman_ansible/playbook_creator.rb
 - app/services/foreman_ansible/proxy_selector.rb
 - app/services/foreman_ansible/roles_importer.rb
+- app/services/foreman_ansible/structured_fact_importer.rb
 - app/services/foreman_ansible/ui_roles_importer.rb
 - app/views/ansible_roles/import.html.erb
 - app/views/ansible_roles/index.html.erb
@@ -142,6 +144,7 @@ files:
 - db/migrate/20160729094457_add_columns_to_ansible_role.rb
 - db/migrate/20160802153302_create_join_table_hostgroup_ansible_roles.rb
 - db/migrate/20160805094233_add_primary_key_hostgroup_ansible_roles.rb
+- db/migrate/20161122154057_automatically_set_role_timestamps.rb
 - db/seeds.d/62_ansible_proxy_feature.rb
 - lib/foreman_ansible.rb
 - lib/foreman_ansible/engine.rb
@@ -175,6 +178,7 @@ files:
 - test/unit/services/fact_sparser_test.rb
 - test/unit/services/proxy_selector_test.rb
 - test/unit/services/roles_importer_test.rb
+- test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
 homepage: https://github.com/theforeman/foreman_ansible
 licenses:
@@ -215,6 +219,7 @@ test_files:
 - test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
 - test/unit/services/fact_parser_test.rb
+- test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/proxy_selector_test.rb
 - test/unit/services/fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb