foreman_ansible 2.3.6 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a63e98af3c6f646f8061f3aa774639c2a6bbfdd6
-  data.tar.gz: 724729ae391dbd935695def5af2bf39c21399a20
+  metadata.gz: aa8c652bdc73b061ee0592c326628e21a4bea04f
+  data.tar.gz: d9c5060f8ead222efbbaf437ee5864df794940e9
 SHA512:
-  metadata.gz: 026de56b6faac6a618353883a6d618f7cbedae7f38cbe964075afb274e0a1634dfffe0eb1e7457360acbbbb1b73c116a20bee9499951109b8528672d0d479483
-  data.tar.gz: 3c40f812a0cefd1d229faddc9f558d01be4bc0b819fc48e102db285d9eb4ecb44f8b1dbc32f9dbd9306c0022ef7db65cd91fffc873d2c3e514379ad6fa457f7c
+  metadata.gz: ec83abd766e3637ca9eeadf4ad73a25139c3f88ec3567b6c85d76e3fb593c53dd800bfe54f6a3f413f77de94b1f18e7dab6ac4a6dda69602dde6c3d1f3e6d01c
+  data.tar.gz: ba89361c44726fb46e7af987f5b496ef364d3aaa7ff367e92cd3e5397bc422f4dad4302dc55468e46859e4cf90942d704cef2bd10ca637ba7c9763a76ad2b250

data/app/controllers/ui_ansible_roles_controller.rb

@@ -0,0 +1,14 @@
+class UiAnsibleRolesController < ::Api::V2::BaseController
+  def resource_name(resource = 'AnsibleRole')
+    super resource
+  end
+
+  def index
+    @ui_ansible_roles = resource_scope_for_index(:permission => :view_ansible_roles)
+  end
+
+  # restore original method from find_common to ignore resource nesting
+  def resource_scope(options = {})
+    @resource_scope ||= scope_for(resource_class, options)
+  end
+end

data/app/helpers/foreman_ansible/ansible_roles_helper.rb

@@ -34,5 +34,9 @@ module ForemanAnsible
     def import_time(role)
       _('%s ago') % time_ago_in_words(role.updated_at)
     end
+
+    def roles_attrs(roles)
+      roles.map { |item| { :id => item.id, :name => item.name } }
+    end
   end
 end

data/app/models/ansible_role.rb

@@ -17,6 +17,7 @@ class AnsibleRole < ApplicationRecord
                                :class_name => 'AnsibleVariable'
 
   scoped_search :on => :name, :complete_value => true
+  scoped_search :on => :id, :complete_value => false
   scoped_search :on => :updated_at
   scoped_search :relation => :hosts,
                 :on => :id, :rename => :host_id, :only_explicit => true

data/app/models/foreman_ansible/ansible_provider.rb

@@ -25,7 +25,8 @@ if defined? ForemanRemoteExecution
             ).to_hash.to_json,
             :remote_execution_command => ansible_command?(
               template_invocation.template
-            )
+            ),
+            :name => host.name
           )
         end
 
@@ -33,6 +34,10 @@ if defined? ForemanRemoteExecution
           true
         end
 
+        def proxy_operation_name
+          Setting::Ansible[:ansible_implementation]
+        end
+
         private
 
         def ansible_command?(template)

data/app/models/setting/ansible.rb

@@ -66,16 +66,6 @@ class Setting
               '360',
               N_('Post-provision timeout')
             ),
-            set(
-              'top_level_ansible_vars',
-              N_('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.'),
-              true,
-              N_('Top level Ansible variables')
-            ),
             set(
               'ansible_interval',
               N_('Timeout (in minutes) when hosts should have reported.'),
@@ -90,6 +80,16 @@ class Setting
               false,
               format(N_('%{cfgmgmt} out of sync disabled'),
                      :cfgmgmt => 'Ansible')
+            ),
+            set(
+              'ansible_implementation',
+              N_('Foreman will run Ansible playbooks using this implementation'),
+              'ansible-playbook',
+              N_('Implementation for running Ansible'),
+              nil,
+              :collection => lambda do
+                Hash[%w[ansible-playbook ansible-runner].map { |x| [x, x] }]
+              end
             )
           ].compact.each do |s|
             create(s.update(:category => 'Setting::Ansible'))

data/app/services/foreman_ansible/inventory_creator.rb

@@ -6,7 +6,7 @@ module ForemanAnsible
   class InventoryCreator
     attr_reader :hosts
 
-    def initialize(hosts, template_invocation)
+    def initialize(hosts, template_invocation = nil)
       @hosts = hosts
       @template_invocation = template_invocation
     end
@@ -35,15 +35,12 @@ module ForemanAnsible
     end
 
     def host_vars(host)
-      result = {
-        'foreman' => host_attributes(host),
-        'foreman_params' => host_params(host),
+      {
+        'foreman' => reduced_host_info(host).fetch('parameters', {}),
         'foreman_ansible_roles' => host_roles(host)
-      }.merge(connection_params(host))
-      if Setting['top_level_ansible_vars']
-        result = result.merge(host_params(host))
-      end
-      result.merge(ansible_params(host))
+      }.merge(connection_params(host)).
+        merge(host_params(host)).
+        merge(ansible_params(host))
     end
 
     def connection_params(host)
@@ -54,24 +51,31 @@ module ForemanAnsible
       #   - both settings, ssh password, effective_user can be used
       # 3rd option:
       #   - other settings
-      params = ansible_settings.
-               merge(remote_execution_options(host)).
-               merge(ansible_extra_options(host))
-      params
+
+      return {} unless @template_invocation
+      ansible_settings.
+        merge(remote_execution_options(host)).
+        merge(ansible_extra_options(host))
     end
 
     def host_roles(host)
       host.all_ansible_roles.map(&:name)
     end
 
-    def host_attributes(host)
-      render_rabl(host, 'api/v2/hosts/main')
-    end
-
     def ansible_params(host)
       ForemanAnsible::AnsibleInfo.new(host).ansible_params
     end
 
+    def reduced_host_info(host)
+      HostInfo.providers.each_with_object({}) do |provider_class, memo|
+        next memo if [HostInfoProviders::HostParamsInfo, ForemanAnsible::AnsibleInfo].include? provider_class
+        provider = provider_class.new(host)
+        info = provider.host_info
+        memo.deep_merge! info if info
+        memo
+      end
+    end
+
     def host_params(host)
       host.host_params
     end
@@ -93,7 +97,6 @@ module ForemanAnsible
 
     def remote_execution_options(host)
       params = {
-        'ansible_become_user' => @template_invocation.effective_user,
         'ansible_user' => host_setting(host, 'remote_execution_ssh_user'),
         'ansible_ssh_pass' => rex_ssh_password(host),
         'ansible_sudo_pass' => rex_sudo_password(host),
@@ -101,7 +104,10 @@ module ForemanAnsible
         'ansible_port' => host_setting(host, 'remote_execution_ssh_port'),
         'ansible_host' => AnsibleProvider.find_ip_or_hostname(host)
       }
-      params['ansible_become'] = true if params['ansible_become_user'].present?
+      if @template_invocation.effective_user.present?
+        params['ansible_become_user'] = @template_invocation.effective_user
+        params['ansible_become'] = true
+      end
       # Backward compatibility for Ansible 1.x
       params['ansible_ssh_port'] = params['ansible_port']
       params['ansible_ssh_user'] = params['ansible_user']
@@ -109,6 +115,7 @@ module ForemanAnsible
     end
 
     def template_inputs(template_invocation)
+      return {} unless template_invocation&.input_values
       input_values = template_invocation.input_values
       result = input_values.each_with_object({}) do |input, vars_hash|
         vars_hash[input.template_input.name] = input.value
@@ -137,10 +144,6 @@ module ForemanAnsible
 
     private
 
-    def render_rabl(host, template)
-      Rabl.render(host, template, :format => 'hash')
-    end
-
     def host_setting(host, setting)
       host.params[setting.to_s] || Setting[setting]
     end

data/app/views/foreman_ansible/ansible_roles/_select_tab_content.html.erb

@@ -1,15 +1,15 @@
+<%= webpacked_plugins_js_for :foreman_ansible %>
+<%= webpacked_plugins_css_for :foreman_ansible %>
+
 <div class='tab-pane' id='ansible_roles'>
-  <%= multiple_selects(
-    f,
-    :ansible_roles,
-    AnsibleRole,
-    f.object.is_a?(Hostgroup) ? (f.object.inherited_and_own_ansible_roles).map(&:id) : f.object.all_ansible_roles.map(&:id),
-    {
-      :disabled => f.object.inherited_ansible_roles.map(&:id),
-      :label => _('Available roles'),
-      :label_help => _('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 ').html_safe
-    },
-    { 'data-inheriteds' => f.object.inherited_ansible_roles.map(&:id).to_json }) %>
+  <div id='ansible_roles_switcher'></div>
+  <% roles = f.object.is_a?(Hostgroup) ? roles_attrs(f.object.inherited_and_own_ansible_roles) : roles_attrs(f.object.all_ansible_roles) %>
+  <% class_name = f.object.is_a?(Hostgroup) ? 'Hostgroup' : 'Host' %>
+  <%= mount_react_component('AnsibleRolesSwitcher', '#ansible_roles_switcher', { :initialAssignedRoles => roles,
+                                                                                 :inheritedRoleIds => f.object.inherited_ansible_roles.map(&:id),
+                                                                                 :availableRolesUrl => ui_ansible_roles_path,
+                                                                                 :resourceId => f.object.id,
+                                                                                 :resourceName => class_name,
+                                                                                 :canView => User.current.can?(:view_ansible_roles)
+                                                                                }.to_json) %>
 </div>

data/app/views/ui_ansible_roles/index.json.rabl

@@ -0,0 +1,3 @@
+collection @ui_ansible_roles
+
+extends "ui_ansible_roles/main"

data/app/views/ui_ansible_roles/main.json.rabl

@@ -0,0 +1,3 @@
+object @ansible_role
+
+extends "ui_ansible_roles/show"

data/app/views/ui_ansible_roles/show.json.rabl

@@ -0,0 +1,3 @@
+object @ansible_role
+
+extends "api/v2/ansible_roles/show"

data/config/routes.rb

@@ -58,6 +58,8 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :ui_ansible_roles, :only => [:index]
+
     resources :ansible_variables, :except => [:show] do
       resources :lookup_values, :only => [:index, :create, :update, :destroy]
       collection do

data/db/migrate/20190328114657_remove_top_level_ansible_variables_setting.rb

@@ -0,0 +1,6 @@
+class RemoveTopLevelAnsibleVariablesSetting < ActiveRecord::Migration[5.2]
+  def up
+    setting = Setting.find_by(:name => 'top_level_ansible_vars')
+    setting.destroy if setting
+  end
+end

data/lib/foreman_ansible/register.rb

@@ -2,7 +2,7 @@
 
 # rubocop:disable BlockLength
 Foreman::Plugin.register :foreman_ansible do
-  requires_foreman '>= 1.21'
+  requires_foreman '>= 1.22'
 
   security_block :foreman_ansible do
     permission :play_roles_on_host,
@@ -17,7 +17,8 @@ Foreman::Plugin.register :foreman_ansible do
                :resource_type => 'Hostgroup'
     permission :view_ansible_roles,
                { :ansible_roles => [:index, :auto_complete_search],
-                 :'api/v2/ansible_roles' => [:index, :show, :fetch] },
+                 :'api/v2/ansible_roles' => [:index, :show, :fetch],
+                 :ui_ansible_roles => [:index] },
                :resource_type => 'AnsibleRole'
     permission :destroy_ansible_roles,
                { :ansible_roles => [:destroy],

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 = '2.3.6'
+  VERSION = '3.0.0'
 end

data/locale/de/foreman_ansible.edit.po

@@ -29,19 +29,14 @@ msgstr ""
 msgid "No changes in roles detected on %s."
 msgstr ""
 
-#: ../app/controllers/ansible_variables_controller.rb:39
-msgid "No changes in variables detected on %s."
-msgstr ""
-
-#: ../app/controllers/ansible_variables_controller.rb:49
+#: ../app/controllers/ansible_variables_controller.rb:31
 msgid ""
 "Import of variables successfully finished.\n"
-"Added: #{results[:added].count} \n"
-" Removed: #{results[:obsolete].count} \n"
-"Updated: #{results[:updated].count}"
+"Added: #{results[:added].join(', ')} \n"
+" Removed: #{results[:obsolete].join(', ')}"
 msgstr ""
 
-#: ../app/controllers/ansible_variables_controller.rb:102
+#: ../app/controllers/ansible_variables_controller.rb:75
 msgid "No proxy found to import variables from, ensure that the smart proxy has the Ansible feature enabled."
 msgstr ""
 
@@ -77,7 +72,7 @@ msgstr ""
 msgid "Import Ansible roles"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_roles_controller.rb:35 ../app/controllers/api/v2/ansible_roles_controller.rb:42 ../app/controllers/api/v2/ansible_variables_controller.rb:73 ../app/controllers/api/v2/ansible_variables_controller.rb:83
+#: ../app/controllers/api/v2/ansible_roles_controller.rb:35 ../app/controllers/api/v2/ansible_roles_controller.rb:42 ../app/controllers/api/v2/ansible_variables_controller.rb:65 ../app/controllers/api/v2/ansible_variables_controller.rb:75
 msgid "Smart Proxy to import from"
 msgstr ""
 
@@ -97,134 +92,114 @@ msgstr ""
 msgid "Smart Proxy to fetch from"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:20
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:19
 msgid "Show variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:24
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:23
 msgid "List Ansible variables"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:30
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:29
 msgid "Deletes Ansible variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:39
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:38
 msgid "Name of variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:40
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:39
 msgid "Role ID"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:41
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:40
 msgid "Default value of variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:42
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:41
 msgid "When enabled the parameter is hidden in the UI"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:43
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:42
 msgid "The order in which values are resolved"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:44
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:43
 msgid "Description of variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:45
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:44
 msgid "Types of validation values"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:46
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:45
 msgid "Used to enforce certain values for the parameter values"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:47
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:46
 msgid "Types of variable values"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:48
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:47
 msgid "Merge all matching values (only array/hash type)"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:49
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:48
 msgid "Include default value when merging all matching values"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:50
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:49
 msgid "Remove duplicate values (only array type)"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:54
-msgid "Create Ansible variable"
-msgstr ""
-
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:61
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:53
 msgid "Updates Ansible variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:71
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:63
 msgid "Import Ansible variables. This will only import variables for already existing roles, it will not import any new roles"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:81
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:73
 msgid "Obsolete Ansible variables. This will only obsolete variables for already existing roles, it will not delete any old roles"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:20
+#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:17
 msgid "Plays Ansible roles on a hostgroup"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:30
+#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:27
 msgid "Plays Ansible roles on hostgroups"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:31
+#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:28
 msgid "IDs of hostgroups to play roles on"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:42
+#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:39
 msgid "List all Ansible roles for a hostgroup"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:53
-msgid "Assigns Ansible roles to a hostgroup"
-msgstr ""
-
-#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:56
-msgid "Ansible roles to assign to a hostgroup"
-msgstr ""
-
 #: ../app/controllers/foreman_ansible/api/v2/hostgroups_param_group_extensions.rb:13 ../app/controllers/foreman_ansible/api/v2/hosts_param_group_extensions.rb:13
 msgid "IDs of associated ansible roles"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:26
+#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:22
 msgid "Plays Ansible roles on a host"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:35
+#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:31
 msgid "Plays Ansible roles on hosts"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:36
+#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:32
 msgid "IDs of hosts to play roles on"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:46
+#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:42
 msgid "List all Ansible roles for a host"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:56
-msgid "Assigns Ansible roles to a host"
-msgstr ""
-
-#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:59
-msgid "Ansible roles to assign to a host"
-msgstr ""
-
 #: ../app/controllers/foreman_ansible/concerns/hostgroups_controller_extensions.rb:27
 msgid "Host group has no associated hosts"
 msgstr ""
@@ -238,30 +213,30 @@ msgid "Could not run Ansible roles for %{host}"
 msgstr ""
 
 #: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:8
-msgid "Import from %s"
+msgid "From %s"
 msgstr ""
 
-#: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:23
-msgid "Ansible Role"
-msgstr ""
-
-#: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:29
+#: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:15
 msgid "Import"
 msgstr ""
 
-#: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:35
+#: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:21
 msgid "%s ago"
 msgstr ""
 
-#: ../app/helpers/foreman_ansible/hosts_helper_extensions.rb:13 ../app/lib/actions/foreman_ansible/helpers/host_common.rb:18
+#: ../app/helpers/foreman_ansible/hosts_helper_extensions.rb:23 ../app/lib/actions/foreman_ansible/helpers/host_common.rb:18
 msgid "Play Ansible roles"
 msgstr ""
 
+#: ../app/helpers/foreman_ansible/hosts_helper_extensions.rb:42
+msgid "Run Ansible roles"
+msgstr ""
+
 #: ../app/lib/actions/foreman_ansible/helpers/host_common.rb:10
 msgid "Playbook execution failed"
 msgstr ""
 
-#: ../app/lib/actions/foreman_ansible/helpers/host_common.rb:30 ../lib/foreman_ansible_core/remote_execution_core/ansible_runner.rb:36
+#: ../app/lib/actions/foreman_ansible/helpers/host_common.rb:30 ../lib/foreman_ansible_core/remote_execution_core/ansible_runner.rb:35
 msgid "Error loading data from proxy"
 msgstr ""
 
@@ -338,30 +313,30 @@ msgid "Post-provision timeout"
 msgstr ""
 
 #: ../app/models/setting/ansible.rb:71
-msgid "Timeout (in minutes) when hosts should have reported."
-msgstr ""
-
-#: ../app/models/setting/ansible.rb:73
-msgid "Ansible report timeout"
+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 ""
 
 #: ../app/models/setting/ansible.rb:77
-msgid "Disable host configuration status turning to out of sync for %{cfgmgmt} after report does not arrive within configured interval"
+msgid "Top level Ansible variables"
 msgstr ""
 
 #: ../app/models/setting/ansible.rb:81
-msgid "%{cfgmgmt} out of sync disabled"
+msgid "Timeout (in minutes) when hosts should have reported."
 msgstr ""
 
-#: ../app/models/setting/ansible.rb:86
-msgid "Foreman will run Ansible playbooks using this implementation"
+#: ../app/models/setting/ansible.rb:83
+msgid "Ansible report timeout"
 msgstr ""
 
-#: ../app/models/setting/ansible.rb:88
-msgid "Implementation for running Ansible"
+#: ../app/models/setting/ansible.rb:87
+msgid "Disable host configuration status turning to out of sync for %{cfgmgmt} after report does not arrive within configured interval"
+msgstr ""
+
+#: ../app/models/setting/ansible.rb:91
+msgid "%{cfgmgmt} out of sync disabled"
 msgstr ""
 
-#: ../app/models/setting/ansible.rb:104 ../lib/foreman_ansible/register.rb:92
+#: ../app/models/setting/ansible.rb:104 ../lib/foreman_ansible/register.rb:73
 msgid "Ansible"
 msgstr ""
 
@@ -405,43 +380,43 @@ msgstr ""
 msgid "Check/Uncheck obsolete"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:19 ../app/views/ansible_variables/import.html.erb:22
+#: ../app/views/ansible_roles/import.html.erb:19 ../app/views/ansible_variables/import.html.erb:19
 msgid "Check/Uncheck all"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:21 ../app/views/ansible_variables/import.html.erb:24
+#: ../app/views/ansible_roles/import.html.erb:21 ../app/views/ansible_variables/import.html.erb:21
 msgid "Name"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:22 ../app/views/ansible_variables/import.html.erb:26
+#: ../app/views/ansible_roles/import.html.erb:22 ../app/views/ansible_variables/import.html.erb:23
 msgid "Hosts count"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:23 ../app/views/ansible_variables/import.html.erb:27
+#: ../app/views/ansible_roles/import.html.erb:23 ../app/views/ansible_variables/import.html.erb:24
 msgid "Hostgroups count"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:24 ../app/views/ansible_variables/import.html.erb:28
+#: ../app/views/ansible_roles/import.html.erb:24 ../app/views/ansible_variables/import.html.erb:25
 msgid "Operation"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:35 ../app/views/ansible_variables/import.html.erb:39
+#: ../app/views/ansible_roles/import.html.erb:35 ../app/views/ansible_variables/import.html.erb:36
 msgid "Check/Uncheck all %s changes"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:40 ../app/views/ansible_variables/import.html.erb:45
+#: ../app/views/ansible_roles/import.html.erb:40 ../app/views/ansible_variables/import.html.erb:42
 msgid "Add"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:40 ../app/views/ansible_variables/import.html.erb:45
+#: ../app/views/ansible_roles/import.html.erb:40 ../app/views/ansible_variables/import.html.erb:42
 msgid "Remove"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:48 ../app/views/ansible_variables/import.html.erb:53
+#: ../app/views/ansible_roles/import.html.erb:48 ../app/views/ansible_variables/import.html.erb:50
 msgid "Cancel"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:49 ../app/views/ansible_variables/import.html.erb:12 ../app/views/ansible_variables/import.html.erb:45 ../app/views/ansible_variables/import.html.erb:54
+#: ../app/views/ansible_roles/import.html.erb:49 ../app/views/ansible_variables/import.html.erb:51
 msgid "Update"
 msgstr ""
 
@@ -465,15 +440,15 @@ msgstr ""
 msgid "Imported at"
 msgstr ""
 
-#: ../app/views/ansible_roles/index.html.erb:13 ../app/views/ansible_variables/index.html.erb:16
+#: ../app/views/ansible_roles/index.html.erb:13 ../app/views/ansible_variables/index.html.erb:12
 msgid "Actions"
 msgstr ""
 
-#: ../app/views/ansible_roles/index.html.erb:27 ../lib/foreman_ansible/register.rb:98
+#: ../app/views/ansible_roles/index.html.erb:27 ../lib/foreman_ansible/register.rb:79
 msgid "Variables"
 msgstr ""
 
-#: ../app/views/ansible_roles/index.html.erb:33 ../app/views/ansible_variables/index.html.erb:41
+#: ../app/views/ansible_roles/index.html.erb:33 ../app/views/ansible_variables/index.html.erb:36
 msgid "Delete %s?"
 msgstr ""
 
@@ -487,83 +462,19 @@ msgstr ""
 msgid "Learn more about this in the documentation."
 msgstr ""
 
-#: ../app/views/ansible_variables/_fields.erb:4
-msgid "Ansible Variable Details (Imported)"
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:4
-msgid "Ansible Variable Details"
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:11
-msgid "Default Behavior"
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:12
-msgid "Override the default value of the Ansible variable."
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:14
-msgid "Mark the variable to be managed by Foreman. When the Ansible role of this variable is assigned to a host, the default value will be added to Ansible inventory as a host variable. Specify matchers to set a different value for such variable."
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:27
-msgid "Value to use when there is no match."
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:30
-msgid "Hidden Value"
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:33
-msgid "Hide all values for this parameter."
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:39
-msgid "Optional Input Validator"
+#: ../app/views/ansible_variables/_ansible_roles_list.html.erb:10
+msgid "Ansible Role"
 msgstr ""
 
-#: ../app/views/ansible_variables/_fields.erb:41
+#: ../app/views/ansible_variables/_validator_text.html.erb:2
 msgid "Before including these variables on your playbooks, Foreman will validate that your variables comply with the validation."
 msgstr ""
 
-#: ../app/views/ansible_variables/_fields.erb:44
-msgid "If checked, will raise an error if there is no default value and no matcher provide a value."
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:53
-msgid "Prioritize Attribute Order"
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:54
-msgid "Set the order in which values are resolved."
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:55
-msgid "Order"
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:56
-msgid "The order in which matchers keys are processed, first match wins.<br> You may use multiple attributes as a matcher key, for example, an order of <code>host group, environment</code> would expect a matcher such as <code>hostgroup = \"web servers\", environment = production</code>"
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:59
-msgid "Continue to look for matches after first find (only array/hash type)? Note: merging overrides ignores all matchers that are omitted."
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:61
-msgid "Include default value when merging all matching values."
+#: ../app/views/ansible_variables/_validator_text.html.erb:4
+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 ""
 
-#: ../app/views/ansible_variables/_fields.erb:64
-msgid "Avoid duplicate values when merging them (only array type)?"
-msgstr ""
-
-#: ../app/views/ansible_variables/_fields.erb:68
-msgid "Specify Matchers"
-msgstr ""
-
-#: ../app/views/ansible_variables/edit.html.erb:4 ../app/views/ansible_variables/index.html.erb:1 ../app/views/ansible_variables/new.html.erb:4
+#: ../app/views/ansible_variables/edit.html.erb:4 ../app/views/ansible_variables/index.html.erb:1
 msgid "Ansible Variables"
 msgstr ""
 
@@ -579,42 +490,22 @@ msgstr ""
 msgid "Changed Ansible variables"
 msgstr ""
 
-#: ../app/views/ansible_variables/import.html.erb:14
-msgid "Check/Uncheck update"
-msgstr ""
-
-#: ../app/views/ansible_variables/import.html.erb:25
+#: ../app/views/ansible_variables/import.html.erb:22
 msgid "Ansible role"
 msgstr ""
 
-#: ../app/views/ansible_variables/index.html.erb:5
-msgid "New Ansible Variable"
-msgstr ""
-
-#: ../app/views/ansible_variables/index.html.erb:12
+#: ../app/views/ansible_variables/index.html.erb:9
 msgid "Variable|Name"
 msgstr ""
 
-#: ../app/views/ansible_variables/index.html.erb:13
+#: ../app/views/ansible_variables/index.html.erb:10
 msgid "Variable|Role"
 msgstr ""
 
-#: ../app/views/ansible_variables/index.html.erb:14
+#: ../app/views/ansible_variables/index.html.erb:11
 msgid "Type"
 msgstr ""
 
-#: ../app/views/ansible_variables/index.html.erb:15
-msgid "Imported?"
-msgstr ""
-
-#: ../app/views/ansible_variables/index.html.erb:23
-msgid "Overriden"
-msgstr ""
-
-#: ../app/views/ansible_variables/new.html.erb:8 ../app/views/ansible_variables/new.html.erb:13
-msgid "Create Ansible Variable"
-msgstr ""
-
 #: ../app/views/foreman_ansible/ansible_roles/_hostgroup_ansible_roles_button.erb:5
 msgid "Play Roles"
 msgstr ""
@@ -627,6 +518,14 @@ msgstr ""
 msgid "Clone"
 msgstr ""
 
+#: ../app/views/foreman_ansible/ansible_roles/_select_tab_content.html.erb:9
+msgid "Available roles"
+msgstr ""
+
+#: ../app/views/foreman_ansible/ansible_roles/_select_tab_content.html.erb:10
+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 ""
+
 #: ../app/views/foreman_ansible/config_reports/_ansible.html.erb:7
 msgid "Level"
 msgstr ""
@@ -655,32 +554,32 @@ msgstr ""
 msgid "Insights remediation on %{hosts_count} host(s) has finished successfully"
 msgstr ""
 
-#: ../lib/foreman_ansible/register.rb:94
+#: ../lib/foreman_ansible/register.rb:75
 msgid "Roles"
 msgstr ""
 
 #: ../lib/foreman_ansible/remote_execution.rb:20
-msgid "Run Ansible roles"
+msgid "Ansible: Run host roles"
 msgstr ""
 
 #: ../lib/foreman_ansible/remote_execution.rb:21
 msgid "Runs an Ansible playbook which contains all the roles defined for a host"
 msgstr ""
 
-#: ../lib/foreman_ansible/remote_execution.rb:27
+#: ../lib/foreman_ansible/remote_execution.rb:26
 msgid "Ansible: Run Insights maintenance plan"
 msgstr ""
 
-#: ../lib/foreman_ansible/remote_execution.rb:28
+#: ../lib/foreman_ansible/remote_execution.rb:27
 msgid "Runs a given maintenance plan from Red Hat Access Insights given an ID."
 msgstr ""
 
 #: action_names.rb:2
-msgid "Import facts"
+msgid "Remote action:"
 msgstr ""
 
 #: action_names.rb:3
-msgid "Action with sub plans"
+msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:4
@@ -688,7 +587,7 @@ msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:5
-msgid "Remote action:"
+msgid "Action with sub plans"
 msgstr ""
 
 #: gemspec.rb:2