CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [22.1.0](https://github.com/theforeman/puppet-foreman_proxy/tree/22.1.0) (2022-05-03)
+
+[Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/22.0.0...22.1.0)
+
+**Implemented enhancements:**
+
+- allow theforeman/foreman 20.x [\#748](https://github.com/theforeman/puppet-foreman_proxy/pull/748) ([evgeni](https://github.com/evgeni))
+
 ## [22.0.0](https://github.com/theforeman/puppet-foreman_proxy/tree/22.0.0) (2022-04-29)
 
 [Full Changelog](https://github.com/theforeman/puppet-foreman_proxy/compare/21.0.0...22.0.0)

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-foreman_proxy",
-  "version": "22.0.0",
+  "version": "22.1.0",
   "author": "theforeman",
   "summary": "Foreman Smart Proxy configuration",
   "license": "GPL-3.0+",
@@ -28,7 +28,7 @@
     },
     {
       "name": "theforeman/foreman",
-      "version_requirement": ">= 10.0.0 < 20.0.0"
+      "version_requirement": ">= 10.0.0 < 21.0.0"
     },
     {
       "name": "theforeman/tftp",

spec/acceptance/ansible_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'Scenario: install foreman-proxy with ansible plugin'  do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   include_examples 'the example', 'ansible.pp'
 

spec/acceptance/basic_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'Scenario: install foreman-proxy' do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   include_examples 'the example', 'basic.pp'
 

spec/acceptance/dns_spec.rb

@@ -3,7 +3,7 @@
 # On EL bind runs using PIDFile in systemd which is broken under docker
 broken_pid_file = ENV['BEAKER_HYPERVISOR'] == 'docker' && host_inventory['facter']['os']['family'] == 'RedHat'
 describe 'Scenario: install foreman-proxy', unless: broken_pid_file do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   include_examples 'the example', 'dns.pp'
 

spec/acceptance/dual_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'Scenario: install foreman-proxy with http and https enabled' do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   include_examples 'the example', 'dual.pp'
 

spec/acceptance/dynflow_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'Scenario: install foreman-proxy', unless: ENV['BEAKER_HYPERVISOR'] == 'docker'  do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   include_examples 'the example', 'dynflow.pp'
 

spec/acceptance/http_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'Scenario: install foreman-proxy with http enabled' do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   it_behaves_like 'the example', 'http.pp'
 

spec/acceptance/journald_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'Scenario: install foreman-proxy with journald' do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   include_examples 'the example', 'journald.pp'
 

spec/acceptance/netboot_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'Scenario: tftp' do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   include_examples 'the example', 'tftp.pp'
 

spec/acceptance/remote_execution_script_pull_mqtt_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'Scenario: install foreman-proxy with remote_execution script plugin with pull-mqtt'  do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   context 'with default params' do
     include_examples 'the example', 'remote_execution_script_pull_mqtt.pp'

spec/acceptance/remote_execution_script_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'Scenario: install foreman-proxy with remote_execution script plugin'  do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   include_examples 'the example', 'remote_execution_script.pp'
 
@@ -13,7 +13,7 @@
 end
 
 describe 'Scenario: install foreman-proxy with remote_execution script plugin and ssh_log_level param' do
-  before(:context) { purge_installed_packages }
+  before(:context) { purge_foreman_proxy }
 
   include_examples 'the example', 'remote_execution_script-ssh_log_level.pp'
 

spec/support/acceptance/cleanup.rb

@@ -1,8 +1,9 @@
-def purge_installed_packages
+def purge_foreman_proxy
   case os[:family]
   when /redhat|fedora/
-    on default, 'yum -y remove foreman* tfm-*'
+    on default, 'yum -y remove foreman* tfm-* mosquitto'
   when /debian|ubuntu/
-    on default, 'apt-get purge -y foreman*', { :acceptable_exit_codes => [0, 100] }
+    on default, 'apt-get purge -y foreman* mosquitto', { :acceptable_exit_codes => [0, 100] }
   end
+  on default, 'rm -rf /etc/mosquitto/'
 end