foreman_ansible 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa8c652bdc73b061ee0592c326628e21a4bea04f
-  data.tar.gz: d9c5060f8ead222efbbaf437ee5864df794940e9
+  metadata.gz: c22bb92d030adea05ee3fd2bec068d463387a319
+  data.tar.gz: 85741d09d78a9beab26eef91276d587c8f40d32c
 SHA512:
-  metadata.gz: ec83abd766e3637ca9eeadf4ad73a25139c3f88ec3567b6c85d76e3fb593c53dd800bfe54f6a3f413f77de94b1f18e7dab6ac4a6dda69602dde6c3d1f3e6d01c
-  data.tar.gz: ba89361c44726fb46e7af987f5b496ef364d3aaa7ff367e92cd3e5397bc422f4dad4302dc55468e46859e4cf90942d704cef2bd10ca637ba7c9763a76ad2b250
+  metadata.gz: 4760aa95956f022b1259a39039761beb43ecccf8ff6f483b3c67e4b889545a3c3fab0baaea87c3c3f484abab851bf8aa27752ef2863a5296801a16d571aa3636
+  data.tar.gz: 359a57e464ac6f408e0cc8e84b2e6d2eeb0bb45ac9db30daa55e3d942f8c82c002a0f03875223fc2eff159c4bb5eb5e4e733a0044e4beed0a293f62360b6ddaf

data/app/controllers/ansible_variables_controller.rb

@@ -35,8 +35,13 @@ class AnsibleVariablesController < ::LookupKeysController
     import_roles = @importer_roles.import_role_names
     import_roles[:new_roles] = import_roles[:new]
     import_variables = @importer.import_variable_names(import_roles[:new_roles])
-    render 'ansible_variables/import',
-           :locals => { :changed => import_variables }
+    if import_variables.values.all?(&:empty?)
+      success(_('No changes in variables detected on %s.') % @proxy.name)
+      redirect_to ansible_variables_path
+    else
+      render 'ansible_variables/import',
+             :locals => { :changed => import_variables }
+    end
   end
 
   def confirm_import

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

@@ -2,14 +2,22 @@
 <%= webpacked_plugins_css_for :foreman_ansible %>
 
 <div class='tab-pane' id='ansible_roles'>
-  <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) %>
+  <%= content_tag(:div, '',
+                  :id => 'ansible_roles_switcher',
+                  'data-roles' => {
+                    :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
+  ) %>
+  <% unless request.xhr? %>
+    <script type="text/javascript">
+      tfm.initAnsibleRoleSwitcher();
+    </script>
+  <% end %>
 </div>

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

data/locale/action_names.rb

@@ -1,5 +1,5 @@
 # Autogenerated!
 _("Remote action:")
-_("Import facts")
 _("Import Puppet classes")
+_("Import facts")
 _("Action with sub plans")

data/locale/de/foreman_ansible.edit.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 2.3.0\n"
+"Project-Id-Version: foreman_ansible 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -29,14 +29,19 @@ msgstr ""
 msgid "No changes in roles detected on %s."
 msgstr ""
 
-#: ../app/controllers/ansible_variables_controller.rb:31
+#: ../app/controllers/ansible_variables_controller.rb:39
+msgid "No changes in variables detected on %s."
+msgstr ""
+
+#: ../app/controllers/ansible_variables_controller.rb:49
 msgid ""
 "Import of variables successfully finished.\n"
-"Added: #{results[:added].join(', ')} \n"
-" Removed: #{results[:obsolete].join(', ')}"
+"Added: #{results[:added].count} \n"
+" Removed: #{results[:obsolete].count} \n"
+"Updated: #{results[:updated].count}"
 msgstr ""
 
-#: ../app/controllers/ansible_variables_controller.rb:75
+#: ../app/controllers/ansible_variables_controller.rb:102
 msgid "No proxy found to import variables from, ensure that the smart proxy has the Ansible feature enabled."
 msgstr ""
 
@@ -72,7 +77,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:65 ../app/controllers/api/v2/ansible_variables_controller.rb:75
+#: ../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
 msgid "Smart Proxy to import from"
 msgstr ""
 
@@ -92,114 +97,134 @@ msgstr ""
 msgid "Smart Proxy to fetch from"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:19
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:20
 msgid "Show variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:23
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:24
 msgid "List Ansible variables"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:29
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:30
 msgid "Deletes Ansible variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:38
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:39
 msgid "Name of variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:39
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:40
 msgid "Role ID"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:40
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:41
 msgid "Default value of variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:41
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:42
 msgid "When enabled the parameter is hidden in the UI"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:42
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:43
 msgid "The order in which values are resolved"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:43
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:44
 msgid "Description of variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:44
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:45
 msgid "Types of validation values"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:45
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:46
 msgid "Used to enforce certain values for the parameter values"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:46
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:47
 msgid "Types of variable values"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:47
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:48
 msgid "Merge all matching values (only array/hash type)"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:48
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:49
 msgid "Include default value when merging all matching values"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:49
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:50
 msgid "Remove duplicate values (only array type)"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:53
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:54
+msgid "Create Ansible variable"
+msgstr ""
+
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:61
 msgid "Updates Ansible variable"
 msgstr ""
 
-#: ../app/controllers/api/v2/ansible_variables_controller.rb:63
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:71
 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:73
+#: ../app/controllers/api/v2/ansible_variables_controller.rb:81
 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:17
+#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:20
 msgid "Plays Ansible roles on a hostgroup"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:27
+#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:30
 msgid "Plays Ansible roles on hostgroups"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:28
+#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:31
 msgid "IDs of hostgroups to play roles on"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:39
+#: ../app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb:42
 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:22
+#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:26
 msgid "Plays Ansible roles on a host"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:31
+#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:35
 msgid "Plays Ansible roles on hosts"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:32
+#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:36
 msgid "IDs of hosts to play roles on"
 msgstr ""
 
-#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:42
+#: ../app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb:46
 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 ""
@@ -213,30 +238,30 @@ msgid "Could not run Ansible roles for %{host}"
 msgstr ""
 
 #: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:8
-msgid "From %s"
+msgid "Import from %s"
 msgstr ""
 
-#: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:15
+#: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:23
+msgid "Ansible Role"
+msgstr ""
+
+#: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:29
 msgid "Import"
 msgstr ""
 
-#: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:21
+#: ../app/helpers/foreman_ansible/ansible_roles_helper.rb:35
 msgid "%s ago"
 msgstr ""
 
-#: ../app/helpers/foreman_ansible/hosts_helper_extensions.rb:23 ../app/lib/actions/foreman_ansible/helpers/host_common.rb:18
+#: ../app/helpers/foreman_ansible/hosts_helper_extensions.rb:13 ../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:35
+#: ../app/lib/actions/foreman_ansible/helpers/host_common.rb:30 ../lib/foreman_ansible_core/remote_execution_core/ansible_runner.rb:36
 msgid "Error loading data from proxy"
 msgstr ""
 
@@ -313,30 +338,30 @@ msgid "Post-provision timeout"
 msgstr ""
 
 #: ../app/models/setting/ansible.rb:71
-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 "Top level Ansible variables"
-msgstr ""
-
-#: ../app/models/setting/ansible.rb:81
 msgid "Timeout (in minutes) when hosts should have reported."
 msgstr ""
 
-#: ../app/models/setting/ansible.rb:83
+#: ../app/models/setting/ansible.rb:73
 msgid "Ansible report timeout"
 msgstr ""
 
-#: ../app/models/setting/ansible.rb:87
+#: ../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"
 msgstr ""
 
-#: ../app/models/setting/ansible.rb:91
+#: ../app/models/setting/ansible.rb:81
 msgid "%{cfgmgmt} out of sync disabled"
 msgstr ""
 
-#: ../app/models/setting/ansible.rb:104 ../lib/foreman_ansible/register.rb:73
+#: ../app/models/setting/ansible.rb:86
+msgid "Foreman will run Ansible playbooks using this implementation"
+msgstr ""
+
+#: ../app/models/setting/ansible.rb:88
+msgid "Implementation for running Ansible"
+msgstr ""
+
+#: ../app/models/setting/ansible.rb:104 ../lib/foreman_ansible/register.rb:92
 msgid "Ansible"
 msgstr ""
 
@@ -380,43 +405,43 @@ msgstr ""
 msgid "Check/Uncheck obsolete"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:19 ../app/views/ansible_variables/import.html.erb:19
+#: ../app/views/ansible_roles/import.html.erb:19 ../app/views/ansible_variables/import.html.erb:22
 msgid "Check/Uncheck all"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:21 ../app/views/ansible_variables/import.html.erb:21
+#: ../app/views/ansible_roles/import.html.erb:21 ../app/views/ansible_variables/import.html.erb:24
 msgid "Name"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:22 ../app/views/ansible_variables/import.html.erb:23
+#: ../app/views/ansible_roles/import.html.erb:22 ../app/views/ansible_variables/import.html.erb:26
 msgid "Hosts count"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:23 ../app/views/ansible_variables/import.html.erb:24
+#: ../app/views/ansible_roles/import.html.erb:23 ../app/views/ansible_variables/import.html.erb:27
 msgid "Hostgroups count"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:24 ../app/views/ansible_variables/import.html.erb:25
+#: ../app/views/ansible_roles/import.html.erb:24 ../app/views/ansible_variables/import.html.erb:28
 msgid "Operation"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:35 ../app/views/ansible_variables/import.html.erb:36
+#: ../app/views/ansible_roles/import.html.erb:35 ../app/views/ansible_variables/import.html.erb:39
 msgid "Check/Uncheck all %s changes"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:40 ../app/views/ansible_variables/import.html.erb:42
+#: ../app/views/ansible_roles/import.html.erb:40 ../app/views/ansible_variables/import.html.erb:45
 msgid "Add"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:40 ../app/views/ansible_variables/import.html.erb:42
+#: ../app/views/ansible_roles/import.html.erb:40 ../app/views/ansible_variables/import.html.erb:45
 msgid "Remove"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:48 ../app/views/ansible_variables/import.html.erb:50
+#: ../app/views/ansible_roles/import.html.erb:48 ../app/views/ansible_variables/import.html.erb:53
 msgid "Cancel"
 msgstr ""
 
-#: ../app/views/ansible_roles/import.html.erb:49 ../app/views/ansible_variables/import.html.erb:51
+#: ../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
 msgid "Update"
 msgstr ""
 
@@ -440,15 +465,15 @@ msgstr ""
 msgid "Imported at"
 msgstr ""
 
-#: ../app/views/ansible_roles/index.html.erb:13 ../app/views/ansible_variables/index.html.erb:12
+#: ../app/views/ansible_roles/index.html.erb:13 ../app/views/ansible_variables/index.html.erb:16
 msgid "Actions"
 msgstr ""
 
-#: ../app/views/ansible_roles/index.html.erb:27 ../lib/foreman_ansible/register.rb:79
+#: ../app/views/ansible_roles/index.html.erb:27 ../lib/foreman_ansible/register.rb:98
 msgid "Variables"
 msgstr ""
 
-#: ../app/views/ansible_roles/index.html.erb:33 ../app/views/ansible_variables/index.html.erb:36
+#: ../app/views/ansible_roles/index.html.erb:33 ../app/views/ansible_variables/index.html.erb:41
 msgid "Delete %s?"
 msgstr ""
 
@@ -462,19 +487,83 @@ msgstr ""
 msgid "Learn more about this in the documentation."
 msgstr ""
 
-#: ../app/views/ansible_variables/_ansible_roles_list.html.erb:10
-msgid "Ansible Role"
+#: ../app/views/ansible_variables/_fields.erb:4
+msgid "Ansible Variable Details (Imported)"
 msgstr ""
 
-#: ../app/views/ansible_variables/_validator_text.html.erb:2
+#: ../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"
+msgstr ""
+
+#: ../app/views/ansible_variables/_fields.erb:41
 msgid "Before including these variables on your playbooks, Foreman will validate that your variables comply with the validation."
 msgstr ""
 
-#: ../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."
+#: ../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/edit.html.erb:4 ../app/views/ansible_variables/index.html.erb:1
+#: ../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."
+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
 msgid "Ansible Variables"
 msgstr ""
 
@@ -490,22 +579,42 @@ msgstr ""
 msgid "Changed Ansible variables"
 msgstr ""
 
-#: ../app/views/ansible_variables/import.html.erb:22
+#: ../app/views/ansible_variables/import.html.erb:14
+msgid "Check/Uncheck update"
+msgstr ""
+
+#: ../app/views/ansible_variables/import.html.erb:25
 msgid "Ansible role"
 msgstr ""
 
-#: ../app/views/ansible_variables/index.html.erb:9
+#: ../app/views/ansible_variables/index.html.erb:5
+msgid "New Ansible Variable"
+msgstr ""
+
+#: ../app/views/ansible_variables/index.html.erb:12
 msgid "Variable|Name"
 msgstr ""
 
-#: ../app/views/ansible_variables/index.html.erb:10
+#: ../app/views/ansible_variables/index.html.erb:13
 msgid "Variable|Role"
 msgstr ""
 
-#: ../app/views/ansible_variables/index.html.erb:11
+#: ../app/views/ansible_variables/index.html.erb:14
 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 ""
@@ -518,14 +627,6 @@ 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 ""
@@ -554,23 +655,23 @@ msgstr ""
 msgid "Insights remediation on %{hosts_count} host(s) has finished successfully"
 msgstr ""
 
-#: ../lib/foreman_ansible/register.rb:75
+#: ../lib/foreman_ansible/register.rb:94
 msgid "Roles"
 msgstr ""
 
 #: ../lib/foreman_ansible/remote_execution.rb:20
-msgid "Ansible: Run host roles"
+msgid "Run Ansible 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:26
+#: ../lib/foreman_ansible/remote_execution.rb:27
 msgid "Ansible: Run Insights maintenance plan"
 msgstr ""
 
-#: ../lib/foreman_ansible/remote_execution.rb:27
+#: ../lib/foreman_ansible/remote_execution.rb:28
 msgid "Runs a given maintenance plan from Red Hat Access Insights given an ID."
 msgstr ""
 
@@ -579,11 +680,11 @@ msgid "Remote action:"
 msgstr ""
 
 #: action_names.rb:3
-msgid "Import facts"
+msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:4
-msgid "Import Puppet classes"
+msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:5