foreman_ansible 6.3.0 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dbc63a3f68609ae8682419576047000d3e815ddfc430e899c93b6f420cdbd8a
-  data.tar.gz: ee146c0e155b24635e223ddb0d1ae6693a9921772001f39dbc64eaadde81a075
+  metadata.gz: 3986780692ba4ebf7918705dc78a06b637e5032371de0b0ed29b74d312ce42ed
+  data.tar.gz: 852691a29487743f21a60c259e3dcbcfbea488df3bbe634b77712e3968090e67
 SHA512:
-  metadata.gz: de0fb54a0b6ef91411c1b09a36d6602bfd11771bd630035596d2ba173c3fc48e258c62e4f7a04c93172ee7f38485be7096ebefe708378b748e8122a5f332729d
-  data.tar.gz: 36f23bdd7d722daababf92449772c6bd1be6e4a5b46ad5913b2fa5a37578bd33c149bab9ce3192481d75192b5600d0c13734957c6e97317ff34230043566cb14
+  metadata.gz: b1987573ed7c1b76377ac756e2d4f01b65f84dd30f0e7d536e12c35f53724a94526701f9f6f179b5af765353ddd087579df62ebbe4b7dcc35f0436cc9834db2f
+  data.tar.gz: 6ad6a28153b718cdd9cbc251c53901072c4413df3fb82d25065c6014ba67124525c1151250954a5fe8c0dd4d081b7e3b1d515c9c38c4f7d57f5f0eeccaccd172

data/app/models/concerns/foreman_ansible/hostgroup_extensions.rb

@@ -6,7 +6,7 @@ module ForemanAnsible
     extend ActiveSupport::Concern
 
     included do
-      has_many :hostgroup_ansible_roles, :foreign_key => :hostgroup_id
+      has_many :hostgroup_ansible_roles, -> { order('hostgroup_ansible_roles.position ASC') }, :foreign_key => :hostgroup_id
       has_many :ansible_roles,
                -> { order('hostgroup_ansible_roles.position ASC') },
                :through => :hostgroup_ansible_roles,

data/app/views/foreman_ansible/job_templates/convert_to_rhel.erb

@@ -34,7 +34,7 @@ kind: job_template
         url: <%= subscription_manager_configuration_url(@host) %>
         dest: /usr/share/convert2rhel/subscription-manager/katello-ca-consumer-latest.noarch.rpm
     - name: Start convert2rhel
-      command: convert2rhel -y --activationkey "<%= input('Activation Key') %>" --org "<%= @host.organization.label %>" > /root/convert2rhel.log
+      command: convert2rhel -y --activationkey "<%= input('Activation Key') %>" --org "<%= @host.organization.label %>" --keep-rhsm
 <%- if input('Restart') == "yes" -%>
     - name: Reboot the machine
       reboot:

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 = '6.3.0'
+  VERSION = '6.3.1'
 end

data/test/unit/hostgroup_ansible_role_test.rb

@@ -19,4 +19,17 @@ class HostgroupAnsibleRoleTest < ActiveSupport::TestCase
     end
     should validate_uniqueness_of(:ansible_role_id).scoped_to(:hostgroup_id)
   end
+
+  describe 'ordering' do
+    test 'should list roles in correct order' do
+      hg = FactoryBot.create(:hostgroup)
+      5.times do |idx|
+        HostgroupAnsibleRole.create(:hostgroup => hg, :ansible_role => FactoryBot.create(:ansible_role), :position => idx)
+      end
+
+      hg.hostgroup_ansible_roles.each_with_index do |item, idx|
+        assert_equal(item.position, idx + 1)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.3.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible_core
@@ -389,54 +389,54 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 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/factories/host_ansible_enhancements.rb
-- test/fixtures/insights_playbook.yaml
-- test/fixtures/report.json
-- test/fixtures/sample_facts.json
+- test/functional/ansible_variables_controller_test.rb
 - test/functional/ansible_roles_controller_test.rb
-- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
+- test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
+- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
-- test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/ui_ansible_roles_controller_test.rb
-- test/functional/ansible_variables_controller_test.rb
 - test/functional/hosts_controller_test.rb
-- test/test_plugin_helper.rb
+- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
 - test/unit/actions/run_ansible_job_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
-- test/unit/ansible_role_test.rb
-- test/unit/ansible_variable_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/helpers/ansible_reports_helper_test.rb
-- test/unit/lib/foreman_ansible_core/command_creator_test.rb
-- test/unit/lib/foreman_ansible_core/ansible_runner_test.rb
-- test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
-- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/services/api_roles_importer_test.rb
+- test/unit/services/ui_roles_importer_test.rb
+- test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/ansible_report_importer_test.rb
-- test/unit/services/fact_importer_test.rb
-- test/unit/services/fact_sparser_test.rb
 - test/unit/services/insights_plan_runner_test.rb
-- test/unit/services/roles_importer_test.rb
-- test/unit/services/structured_fact_importer_test.rb
-- test/unit/services/ansible_variables_importer_test.rb
-- test/unit/services/ui_roles_importer_test.rb
-- test/unit/services/api_roles_importer_test.rb
+- test/unit/services/fact_importer_test.rb
 - test/unit/services/fact_parser_test.rb
+- test/unit/services/roles_importer_test.rb
+- test/unit/services/fact_sparser_test.rb
 - test/unit/services/inventory_creator_test.rb
-- test/unit/ansible_provider_test.rb
-- test/unit/host_ansible_role_test.rb
+- test/unit/services/ansible_variables_importer_test.rb
+- test/unit/lib/foreman_ansible_core/command_creator_test.rb
+- test/unit/lib/foreman_ansible_core/ansible_runner_test.rb
+- test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
+- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/ansible_role_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
-- test/unit/import_roles_and_variables.rb
+- test/unit/ansible_variable_test.rb
+- test/unit/host_ansible_role_test.rb
+- test/unit/helpers/ansible_reports_helper_test.rb
+- test/unit/ansible_provider_test.rb
 - test/unit/ignore_roles_test.rb
-- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
+- test/unit/import_roles_and_variables.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/factories/ansible_proxy.rb
+- test/factories/host_ansible_enhancements.rb
+- test/factories/ansible_variables.rb
+- test/factories/ansible_roles.rb
+- test/fixtures/report.json
+- test/fixtures/sample_facts.json
+- test/fixtures/insights_playbook.yaml
+- test/test_plugin_helper.rb