foreman_ansible 3.0.0 → 3.0.1

data/locale/zh_TW/foreman_ansible.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"
@@ -41,6 +41,12 @@ msgstr ""
 msgid "Ansible Roles"
 msgstr ""
 
+msgid "Ansible Variable Details"
+msgstr ""
+
+msgid "Ansible Variable Details (Imported)"
+msgstr ""
+
 msgid "Ansible Variables"
 msgstr ""
 
@@ -53,19 +59,28 @@ msgstr ""
 msgid "Ansible role names to import"
 msgstr ""
 
+msgid "Ansible roles to assign to a host"
+msgstr ""
+
+msgid "Ansible roles to assign to a hostgroup"
+msgstr ""
+
 msgid "Ansible support in Foreman"
 msgstr ""
 
 msgid "Ansible: Run Insights maintenance plan"
 msgstr ""
 
-msgid "Ansible: Run host roles"
+msgid "Arguments"
 msgstr ""
 
-msgid "Arguments"
+msgid "Assigns Ansible roles to a host"
+msgstr ""
+
+msgid "Assigns Ansible roles to a hostgroup"
 msgstr ""
 
-msgid "Available roles"
+msgid "Avoid duplicate values when merging them (only array type)?"
 msgstr ""
 
 msgid "Before including these variables on your playbooks, Foreman will validate that your variables comply with the validation."
@@ -92,18 +107,33 @@ msgstr ""
 msgid "Check/Uncheck obsolete"
 msgstr ""
 
+msgid "Check/Uncheck update"
+msgstr ""
+
 msgid "Clone"
 msgstr ""
 
 msgid "Connection type"
 msgstr ""
 
+msgid "Continue to look for matches after first find (only array/hash type)? Note: merging overrides ignores all matchers that are omitted."
+msgstr ""
+
 msgid "Could not run Ansible roles for %{host}"
 msgstr ""
 
+msgid "Create Ansible Variable"
+msgstr ""
+
+msgid "Create Ansible variable"
+msgstr ""
+
 msgid "Create an override value for a specific ansible variable"
 msgstr ""
 
+msgid "Default Behavior"
+msgstr ""
+
 msgid "Default value of variable"
 msgstr ""
 
@@ -152,7 +182,13 @@ msgstr ""
 msgid "Foreman will add the this level of verbosity for additional debugging output when running Ansible playbooks."
 msgstr ""
 
-msgid "From %s"
+msgid "Foreman will run Ansible playbooks using this implementation"
+msgstr ""
+
+msgid "Hidden Value"
+msgstr ""
+
+msgid "Hide all values for this parameter."
 msgstr ""
 
 msgid "Host group has no associated hosts"
@@ -179,7 +215,10 @@ 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."
+msgid "If checked, will raise an error if there is no default value and no matcher provide a value."
+msgstr ""
+
+msgid "Implementation for running Ansible"
 msgstr ""
 
 msgid "Import"
@@ -197,21 +236,31 @@ msgstr ""
 msgid "Import facts"
 msgstr ""
 
+msgid "Import from %s"
+msgstr ""
+
 msgid "Import of roles successfully finished."
 msgstr ""
 
 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 ""
 
 msgid "Imported at"
 msgstr ""
 
+msgid "Imported?"
+msgstr ""
+
 msgid "Include default value when merging all matching values"
 msgstr ""
 
+msgid "Include default value when merging all matching values."
+msgstr ""
+
 msgid "Insights remediation on %{hosts_count} host(s) has finished successfully"
 msgstr ""
 
@@ -251,6 +300,9 @@ msgstr ""
 msgid "List all Ansible roles for a hostgroup"
 msgstr ""
 
+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 ""
+
 msgid "Merge all matching values (only array/hash type)"
 msgstr ""
 
@@ -272,6 +324,9 @@ msgstr ""
 msgid "New"
 msgstr ""
 
+msgid "New Ansible Variable"
+msgstr ""
+
 msgid ""
 "No ansible roles were found in Foreman. If you want to assign roles to your hosts,\n"
 "             you have to import them first."
@@ -283,6 +338,9 @@ msgstr ""
 msgid "No changes in roles detected."
 msgstr ""
 
+msgid "No changes in variables detected on %s."
+msgstr ""
+
 msgid "No proxy found to import variables from, ensure that the smart proxy has the Ansible feature enabled."
 msgstr ""
 
@@ -301,12 +359,24 @@ msgstr ""
 msgid "Operation"
 msgstr ""
 
+msgid "Optional Input Validator"
+msgstr ""
+
+msgid "Order"
+msgstr ""
+
 msgid "Override match"
 msgstr ""
 
+msgid "Override the default value of the Ansible variable."
+msgstr ""
+
 msgid "Override value, required if omit is false"
 msgstr ""
 
+msgid "Overriden"
+msgstr ""
+
 msgid "Play Ansible roles"
 msgstr ""
 
@@ -331,6 +401,9 @@ msgstr ""
 msgid "Post-provision timeout"
 msgstr ""
 
+msgid "Prioritize Attribute Order"
+msgstr ""
+
 msgid "Private Key Path"
 msgstr ""
 
@@ -370,6 +443,9 @@ msgstr ""
 msgid "Select the changes you want to realize in Foreman"
 msgstr ""
 
+msgid "Set the order in which values are resolved."
+msgstr ""
+
 msgid "Show role"
 msgstr ""
 
@@ -382,13 +458,16 @@ msgstr ""
 msgid "Smart Proxy to import from"
 msgstr ""
 
-msgid "The order in which values are resolved"
+msgid "Specify Matchers"
 msgstr ""
 
-msgid "There are no Ansible roles to play"
+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 ""
+
+msgid "The order in which values are resolved"
 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 "
+msgid "There are no Ansible roles to play"
 msgstr ""
 
 msgid "Timeout (in minutes) when hosts should have reported."
@@ -400,9 +479,6 @@ msgstr ""
 msgid "Toggle"
 msgstr ""
 
-msgid "Top level Ansible variables"
-msgstr ""
-
 msgid "Type"
 msgstr ""
 
@@ -433,6 +509,9 @@ msgstr ""
 msgid "Used to enforce certain values for the parameter values"
 msgstr ""
 
+msgid "Value to use when there is no match."
+msgstr ""
+
 msgid "Variables"
 msgstr ""
 
@@ -445,8 +524,5 @@ msgstr ""
 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"
 msgstr ""

data/package.json

@@ -8,17 +8,17 @@
   },
   "dependencies": {
     "babel-polyfill": "^6.26.0",
-    "classnames": "^2.2.6",
-    "lodash": "4.17.10",
+    "classnames": "^2.2.5",
+    "lodash": "^4.17.11",
     "patternfly": "^3.58.0",
     "patternfly-react": "^2.25.4",
-    "prop-types": "^15.7.2",
+    "prop-types": "^15.6.2",
     "react": "^16.6.3",
     "react-bootstrap": "^0.32.4",
     "react-dom": "^16.6.3",
     "react-json-tree": "^0.11.0",
     "reselect": "^3.0.1",
-    "seamless-immutable": "7.1.2"
+    "seamless-immutable": "^7.1.3"
   },
   "devDependencies": {
     "babel-eslint": "^8.2.1",
@@ -41,9 +41,9 @@
     "identity-obj-proxy": "^3.0.0",
     "jest": "^23.6.0",
     "prettier": "^1.16.4",
-    "react-redux": "^6.0.0",
+    "react-redux": "^5.0.7",
     "react-redux-test-utils": "^0.1.1",
-    "redux": "^4.0.1",
+    "redux": "^3.7.2",
     "redux-thunk": "^2.3.0"
   },
   "scripts": {

data/test/functional/ansible_variables_controller_test.rb

@@ -5,6 +5,7 @@ require 'test_plugin_helper'
 class AnsibleVariablesControllerTest < ActionController::TestCase
   setup do
     @model = FactoryBot.create(:ansible_variable)
+    @proxy = FactoryBot.create(:smart_proxy, :with_ansible)
   end
 
   basic_index_test
@@ -27,9 +28,23 @@ class AnsibleVariablesControllerTest < ActionController::TestCase
     ForemanAnsible::UiRolesImporter.any_instance.
       expects(:import_role_names).returns({})
 
-    proxy = FactoryBot.create(:smart_proxy, :with_ansible)
     get :import,
-        :params => { :proxy => proxy.id },
+        :params => { :proxy => @proxy.id },
+        :session => set_session_user
+    assert_redirected_to ansible_variables_url
+  end
+
+  test 'should show import page' do
+    ForemanAnsible::UiRolesImporter.any_instance.
+      expects(:import_role_names).returns({})
+
+    ForemanAnsible::VariablesImporter.any_instance.
+      expects(:import_variable_names).returns({
+        :obsolete => [@model]
+      })
+
+    get :import,
+        :params => { :proxy => @proxy.id },
         :session => set_session_user
     assert_response :success
   end

data/webpack/index.js

@@ -2,6 +2,7 @@ import componentRegistry from 'foremanReact/components/componentRegistry';
 import injectReducer from 'foremanReact/redux/reducers/registerReducer';
 import ReportJsonViewer from './components/ReportJsonViewer';
 import AnsibleRolesSwitcher from './components/AnsibleRolesSwitcher';
+import $ from 'jquery';
 
 import reducer from './reducer';
 
@@ -15,3 +16,13 @@ componentRegistry.register({
 });
 
 injectReducer('foremanAnsible', reducer);
+
+window.tfm.initAnsibleRoleSwitcher = () => {
+  $(document).on('ContentLoad', evt => {
+    tfm.reactMounter.mount(
+      'AnsibleRolesSwitcher',
+      '#ansible_roles_switcher',
+      $('#ansible_roles_switcher').data('roles')
+    );
+  });
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -382,48 +382,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
+- test/factories/ansible_proxy.rb
+- test/factories/ansible_variables.rb
+- test/factories/ansible_roles.rb
+- test/test_plugin_helper.rb
 - test/unit/host_ansible_role_test.rb
-- test/unit/helpers/ansible_reports_helper_test.rb
 - test/unit/ansible_role_test.rb
-- test/unit/concerns/config_reports_extensions_test.rb
-- test/unit/concerns/host_managed_extensions_test.rb
-- test/unit/concerns/hostgroup_extensions_test.rb
-- test/unit/lib/foreman_ansible_core/command_creator_test.rb
-- test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
-- test/unit/lib/proxy_api/ansible_test.rb
-- test/unit/ansible_provider_test.rb
-- test/unit/ansible_variable_test.rb
-- test/unit/hostgroup_ansible_role_test.rb
-- test/unit/services/fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
-- test/unit/services/inventory_creator_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/insights_plan_runner_test.rb
+- test/unit/services/ansible_report_importer_test.rb
+- test/unit/services/inventory_creator_test.rb
+- test/unit/services/fact_importer_test.rb
+- test/unit/services/fact_sparser_test.rb
+- test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/fact_parser_test.rb
 - test/unit/services/ansible_variables_importer_test.rb
 - test/unit/services/api_roles_importer_test.rb
-- test/unit/services/structured_fact_importer_test.rb
-- test/unit/services/fact_sparser_test.rb
-- test/unit/services/ansible_report_importer_test.rb
+- test/unit/ansible_variable_test.rb
+- test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
+- test/unit/lib/foreman_ansible_core/command_creator_test.rb
+- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/hostgroup_ansible_role_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
+- test/unit/concerns/host_managed_extensions_test.rb
+- test/unit/concerns/config_reports_extensions_test.rb
+- test/unit/helpers/ansible_reports_helper_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
 - test/unit/actions/run_ansible_job_test.rb
-- test/test_plugin_helper.rb
+- test/unit/ansible_provider_test.rb
+- test/fixtures/insights_playbook.yaml
+- test/fixtures/sample_facts.json
+- test/fixtures/report.json
 - test/functional/hosts_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
-- test/functional/ui_ansible_roles_controller_test.rb
 - test/functional/ansible_roles_controller_test.rb
 - test/functional/ansible_variables_controller_test.rb
-- test/factories/ansible_roles.rb
-- test/factories/ansible_proxy.rb
-- test/factories/ansible_variables.rb
-- test/fixtures/report.json
-- test/fixtures/sample_facts.json
-- test/fixtures/insights_playbook.yaml
+- test/functional/ui_ansible_roles_controller_test.rb