Set release compatibility to 1.17+

README.md

@@ -51,8 +51,7 @@ previous stable release.
 
 ### Foreman version compatibility notes
 
-For Foreman 1.16 or older, please set the `dynflow_in_core` parameter to false.
-For Foreman 1.13 or older, please use the 5.x release series of this module.
+For Foreman 1.16 or older, please use the 9.x release series of this module.
 
 ## Types and providers
 

manifests/init.pp

@@ -217,8 +217,6 @@
 #
 # $jobs_service::                 Name of the service for running the background Dynflow executor
 #
-# $dynflow_in_core::              Whether the Dynflow executor service is provided by Foreman or tasks
-#
 # $hsts_enabled::                 Should HSTS enforcement in https requests be enabled
 #
 class foreman (
@@ -322,8 +320,7 @@
   Boolean $telemetry_logger_enabled = $::foreman::params::telemetry_logger_enabled,
   Enum['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'] $telemetry_logger_level = $::foreman::params::telemetry_logger_level,
   Integer[0, 65535] $dynflow_pool_size = $::foreman::params::dynflow_pool_size,
-  Optional[String] $jobs_service = $::foreman::params::jobs_service,
-  Boolean $dynflow_in_core = $::foreman::params::dynflow_in_core,
+  String $jobs_service = $::foreman::params::jobs_service,
   Boolean $hsts_enabled = $::foreman::params::hsts_enabled,
 ) inherits foreman::params {
   if $db_adapter == 'UNSET' {

manifests/params.pp

@@ -2,7 +2,7 @@
 class foreman::params {
   $lower_fqdn = downcase($::fqdn)
 
-# Basic configurations
+  # Basic configurations
   $foreman_url      = "https://${lower_fqdn}"
   $foreman_user     = undef
   $foreman_password = undef
@@ -43,14 +43,13 @@
   # Only configure extra SCL repos on EL
   $configure_scl_repo       = ($::osfamily == 'RedHat' and $::operatingsystem != 'Fedora')
 
-# Advanced configuration - no need to change anything here by default
-  # if set to true, no repo will be added by this module, letting you 
+  # Advanced configuration - no need to change anything here by default
+  # if set to true, no repo will be added by this module, letting you
   # set it to some custom location.
   $custom_repo       = false
   # this can be stable, or nightly
   $repo              = 'stable'
-  $railspath         = '/usr/share'
-  $app_root          = "${railspath}/foreman"
+  $app_root          = '/usr/share/foreman'
   $plugin_config_dir = '/etc/foreman/plugins'
   $manage_user       = true
   $user              = 'foreman'
@@ -101,11 +100,9 @@
 
   # Configure how many workers should Dynflow use
   $dynflow_pool_size = 5
-  # Defines whether Foreman or the tasks plugin provides the Dynflow executor
-  $dynflow_in_core = true
 
   # Define job processing service properties
-  $jobs_service = undef
+  $jobs_service = 'dynflowd'
   $jobs_service_ensure = 'running'
   $jobs_service_enable = true
 

manifests/plugin/ansible.pp

@@ -3,6 +3,5 @@
   include ::foreman::plugin::tasks
 
   foreman::plugin {'ansible':
-    notify => Class['foreman::service::jobs'],
   }
 }

manifests/plugin/remote_execution.pp

@@ -3,6 +3,5 @@
   include ::foreman::plugin::tasks
 
   foreman::plugin {'remote_execution':
-    notify => Class['foreman::service::jobs'],
   }
 }

manifests/plugin/tasks.pp

@@ -15,11 +15,8 @@
   Boolean $automatic_cleanup = $::foreman::plugin::tasks::params::automatic_cleanup,
   String $cron_line = $::foreman::plugin::tasks::params::cron_line,
 ) inherits foreman::plugin::tasks::params {
-  include ::foreman::service::jobs
-
   foreman::plugin { 'tasks':
     package => $package,
-    notify  => Class['foreman::service::jobs'],
   }
   $cron_state = $automatic_cleanup ? {
     true    => 'present',

manifests/service.pp

@@ -1,14 +1,17 @@
 # Configure the foreman service
 class foreman::service(
-  $passenger       = $::foreman::passenger,
-  $app_root        = $::foreman::app_root,
-  $ssl             = $::foreman::ssl,
-  $dynflow_in_core = $::foreman::dynflow_in_core,
+  Boolean $passenger = $::foreman::passenger,
+  Stdlib::Absolutepath $app_root = $::foreman::app_root,
+  Boolean $ssl = $::foreman::ssl,
+  String $jobs_service = $::foreman::jobs_service,
+  Enum['running', 'stopped'] $jobs_service_ensure = $::foreman::jobs_service_ensure,
+  Boolean $jobs_service_enable = $::foreman::jobs_service_enable,
 ) {
   anchor { ['foreman::service_begin', 'foreman::service_end']: }
 
-  if $dynflow_in_core {
-    contain ::foreman::service::jobs
+  service { $jobs_service:
+    ensure => $jobs_service_ensure,
+    enable => $jobs_service_enable,
   }
 
   if $passenger {

metadata.json

@@ -65,7 +65,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8",
         "9"
       ]
     },

spec/classes/foreman_service_spec.rb

@@ -12,7 +12,7 @@
     end
 
     it { is_expected.to compile.with_all_deps }
-    it { is_expected.to contain_class('foreman::service::jobs') }
+    it { is_expected.to contain_service('dynflowd').with_ensure('running').with_enable(true) }
 
     it 'should restart passenger' do
       should contain_exec('restart_foreman').with({
@@ -37,10 +37,12 @@
 
     let :params do
       {
-        :passenger => true,
-        :app_root  => '/usr/share/foreman',
-        :ssl => true,
-        :dynflow_in_core => false,
+        :passenger           => true,
+        :app_root            => '/usr/share/foreman',
+        :ssl                 => true,
+        :jobs_service        => 'dynflower',
+        :jobs_service_ensure => 'stopped',
+        :jobs_service_enable => false,
       }
     end
 
@@ -49,7 +51,7 @@
     end
 
     it { is_expected.to compile.with_all_deps }
-    it { is_expected.not_to contain_class('foreman::service::jobs') }
+    it { is_expected.to contain_service('dynflower').with_ensure('stopped').with_enable(false) }
 
     it 'should restart passenger' do
       should contain_exec('restart_foreman').with({
@@ -72,30 +74,32 @@
     context 'without ssl' do
       let :params do
         {
-          :passenger => true,
-          :app_root  => '/usr/share/foreman',
-          :ssl => false,
-          :dynflow_in_core => false,
+          :passenger           => true,
+          :app_root            => '/usr/share/foreman',
+          :ssl                 => false,
+          :jobs_service        => 'dynflowd',
+          :jobs_service_ensure => 'running',
+          :jobs_service_enable => true,
         }
       end
 
       it { is_expected.to compile.with_all_deps }
-      it { is_expected.not_to contain_class('foreman::service::jobs') }
     end
   end
 
   context 'without passenger' do
     let :params do
       {
-        :passenger => false,
-        :app_root  => '/usr/share/foreman',
-        :ssl => true,
-        :dynflow_in_core => false,
+        :passenger           => false,
+        :app_root            => '/usr/share/foreman',
+        :ssl                 => true,
+        :jobs_service        => 'dynflowd',
+        :jobs_service_ensure => 'running',
+        :jobs_service_enable => true,
       }
     end
 
     it { is_expected.to compile.with_all_deps }
-    it { is_expected.not_to contain_class('foreman::service::jobs') }
 
     it 'should not restart passenger' do
       should_not contain_exec('restart_foreman')

spec/classes/plugin/remote_execution_spec.rb

@@ -7,7 +7,7 @@
       let(:pre_condition) { 'include foreman' }
 
       it { should compile.with_all_deps }
-      it { should contain_foreman__plugin('remote_execution').that_notifies("Class[foreman::service::jobs]") }
+      it { should contain_foreman__plugin('remote_execution').that_notifies("Class[foreman::service]") }
       it { should contain_foreman__plugin('tasks') }
     end
   end

spec/classes/plugin/tasks_spec.rb

@@ -25,8 +25,6 @@
 
       it { should compile.with_all_deps }
 
-      it { should contain_class('foreman::service::jobs') }
-
       it 'should call the plugin' do
         should contain_foreman__plugin('tasks').with_package(package_name)
         should contain_file('/etc/cron.d/foreman-tasks').

spec/defines/foreman_repos_apt_spec.rb

@@ -4,7 +4,7 @@
   let(:title) { 'foreman' }
 
   let :facts do
-    on_supported_os['debian-8-x86_64']
+    on_supported_os['debian-9-x86_64']
   end
 
   context 'with repo => stable' do
@@ -18,7 +18,7 @@
         with_repos('stable')
 
       should contain_file('/etc/apt/sources.list.d/foreman.list').
-        with_content(/deb http:\/\/deb.theforeman.org\/ jessie stable/)
+        with_content(%r{deb http://deb\.theforeman\.org/ stretch stable})
 
       should contain_apt__source('foreman-plugins').
         with_location('http://deb.theforeman.org/').
@@ -37,23 +37,23 @@
     it { should contain_apt_key(apt_key_title).with_id(apt_key) }
   end
 
-  context 'with repo => 1.11' do
-    let(:params) { {:repo => '1.11'} }
+  context 'with repo => 1.18' do
+    let(:params) { {:repo => '1.18'} }
 
     it { should contain_class('apt') }
 
-    it 'should add the 1.11 repo' do
+    it 'should add the 1.18 repo' do
       should contain_apt__source('foreman').
         with_location('http://deb.theforeman.org/').
-        with_repos('1.11')
+        with_repos('1.18')
 
       should contain_file('/etc/apt/sources.list.d/foreman.list').
-        with_content(/deb http:\/\/deb.theforeman.org\/ jessie 1.11/)
+        with_content(%r{deb http://deb\.theforeman\.org/ stretch 1\.18})
 
       should contain_apt__source('foreman-plugins').
         with_location('http://deb.theforeman.org/').
         with_release('plugins').
-        with_repos('1.11')
+        with_repos('1.18')
     end
   end
 
@@ -68,7 +68,7 @@
         with_repos('nightly')
 
       should contain_file('/etc/apt/sources.list.d/foreman.list').
-        with_content(/deb http:\/\/deb.theforeman.org\/ jessie nightly/)
+        with_content(%r{deb http://deb\.theforeman\.org/ stretch nightly})
 
       should contain_apt__source('foreman-plugins').
         with_location('http://deb.theforeman.org/').