.fixtures.yml

@@ -10,9 +10,9 @@ fixtures:
       repo: "https://github.com/puppetlabs/puppetlabs-cron_core"
       puppet_version: ">= 6.0.0"
     extlib:           'https://github.com/voxpupuli/puppet-extlib'
-    mysql:            'https://github.com/puppetlabs/puppetlabs-mysql'
     postgresql:       'https://github.com/puppetlabs/puppetlabs-postgresql'
     puppet:           'https://github.com/theforeman/puppet-puppet'
+    redis:            'https://github.com/voxpupuli/puppet-redis'
     systemd:          'https://github.com/camptocamp/puppet-systemd'
     selinux_core:
       repo: "https://github.com/puppetlabs/puppetlabs-selinux_core"

.sync.yml

@@ -2,7 +2,7 @@
 .travis.yml:
   beaker_sets:
     - centos7-64
-    - debian9-64
+    - debian10-64
   env:
     global:
       - PARALLEL_TEST_PROCESSORS=8

.travis.yml

@@ -37,7 +37,7 @@ matrix:
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet5
-        - BEAKER_setfile=debian9-64{hostname=debian9-64.example.com}
+        - BEAKER_setfile=debian10-64{hostname=debian10-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
@@ -48,7 +48,7 @@ matrix:
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet6
-        - BEAKER_setfile=debian9-64{hostname=debian9-64.example.com}
+        - BEAKER_setfile=debian10-64{hostname=debian10-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [14.0.0](https://github.com/theforeman/puppet-foreman/tree/14.0.0) (2020-02-12)
+
+[Full Changelog](https://github.com/theforeman/puppet-foreman/compare/13.1.0...14.0.0)
+
+**Breaking changes:**
+
+- Drop foreman::config::passenger::fragment [\#799](https://github.com/theforeman/puppet-foreman/pull/799) ([ekohl](https://github.com/ekohl))
+- Ensure plugins are installed before the database [\#792](https://github.com/theforeman/puppet-foreman/pull/792) ([ekohl](https://github.com/ekohl))
+- Drop keepalive parameters [\#785](https://github.com/theforeman/puppet-foreman/pull/785) ([ekohl](https://github.com/ekohl))
+- Drop listen\_on\_interface [\#784](https://github.com/theforeman/puppet-foreman/pull/784) ([ekohl](https://github.com/ekohl))
+- Drop the selinux parameter [\#783](https://github.com/theforeman/puppet-foreman/pull/783) ([ekohl](https://github.com/ekohl))
+- Drop multiple database support [\#781](https://github.com/theforeman/puppet-foreman/pull/781) ([ekohl](https://github.com/ekohl))
+- Drop Debian 9 and Ubuntu 16.04, add Debian 10 [\#777](https://github.com/theforeman/puppet-foreman/pull/777) ([mmoll](https://github.com/mmoll))
+- Fixes [\#28067](https://projects.theforeman.org/issues/28067) - dynflow sidekiq services config [\#761](https://github.com/theforeman/puppet-foreman/pull/761) ([ezr-ondrej](https://github.com/ezr-ondrej))
+
+**Implemented enhancements:**
+
+- Run migrations if there are pending migrations [\#778](https://github.com/theforeman/puppet-foreman/pull/778) ([ehelms](https://github.com/ehelms))
+- Fixes [\#26739](https://projects.theforeman.org/issues/26739) - Add admin users locale and timezone setting [\#731](https://github.com/theforeman/puppet-foreman/pull/731) ([sbernhard](https://github.com/sbernhard))
+
+**Fixed bugs:**
+
+- Refs [\#28067](https://projects.theforeman.org/issues/28067): Ensure dynflow worker config exists before service [\#791](https://github.com/theforeman/puppet-foreman/pull/791) ([ehelms](https://github.com/ehelms))
+
 ## [13.1.0](https://github.com/theforeman/puppet-foreman/tree/13.1.0) (2019-11-25)
 
 [Full Changelog](https://github.com/theforeman/puppet-foreman/compare/13.0.1...13.1.0)

Gemfile

@@ -30,6 +30,7 @@ gem 'beaker', '>= 4.2.0', {"groups"=>["system_tests"]}
 gem 'beaker-docker', {"groups"=>["system_tests"]}
 gem 'beaker-hostgenerator', '>= 1.1.10', {"groups"=>["system_tests"]}
 gem 'beaker-puppet', {"groups"=>["system_tests"]}
+gem 'beaker-vagrant', {"groups"=>["system_tests"]}
 gem 'beaker-rspec', {"groups"=>["system_tests"]}
 gem 'beaker-module_install_helper', {"groups"=>["system_tests"]}
 gem 'beaker-puppet_install_helper', {"groups"=>["system_tests"]}

README.md

@@ -29,15 +29,10 @@ to configure Foreman's Smart Proxy and related services.
 
 ## Database support
 
-This module supports configuration of either SQLite, PostgreSQL or MySQL as the
-database for Foreman. The database type can be changed using the `db_type`
-parameter, or management disabled with `db_manage`.
-
 The default database is PostgreSQL, which will be fully installed and managed
 on the host this module is applied to. Databases will be created with using the
 `en_US.utf8` locale, which means a respective OS locale must be available on
-the database host. If using MySQL, the puppetlabs-mysql module must be added to
-the modulepath, otherwise it's not required.
+the database host. The database management can be disabled with `db_manage`.
 
 ## Support policy
 
@@ -51,20 +46,15 @@ previous stable release.
 
 ### Foreman version compatibility notes
 
-This module targets Foreman 1.21+. Running without passenger is only supported
-on Foreman 1.23+. The Azure plugin support only works with Foreman 1.24+.
-
-The Foreman userdata plugin has been merged into Foreman 1.23 and removed from
-this module.
+This module targets Foreman 2.0+.
 
 ## Running without passenger
 
 To use this module without passenger, the `passenger` parameter must be set to
 `false`. This will install the `foreman-service` package and ensure the service
 is running.
 
-This introduces a soft dependency on `camptocamp-systemd`. This feature is only
-available on Foreman 1.23+.
+This introduces a soft dependency on `camptocamp-systemd`.
 
 ## Types and providers
 

manifests/config.pp

@@ -6,6 +6,19 @@
     Class['puppet::server::install'] -> Class['foreman::config']
   }
 
+  if $::foreman::jobs_manage_service {
+    if $::foreman::jobs_sidekiq_redis_url != undef {
+      $jobs_redis_url = $::foreman::jobs_sidekiq_redis_url
+    } else {
+      include ::redis
+      $jobs_redis_url = "redis://localhost:${::redis::port}/6"
+    }
+
+    file { '/etc/foreman/dynflow':
+      ensure => directory,
+    }
+  }
+
   concat::fragment {'foreman_settings+01-header.yaml':
     target  => '/etc/foreman/settings.yaml',
     content => template('foreman/settings.yaml.erb'),
@@ -41,7 +54,7 @@
     ensure  => directory,
   }
 
-  if $::foreman::db_root_cert and $::foreman::db_type == 'postgresql' {
+  if $::foreman::db_root_cert {
     $pg_cert_dir = "${::foreman::app_root}/.postgresql"
 
     file { $pg_cert_dir:
@@ -88,7 +101,7 @@
         fail("${::hostname}: The system does not seem to be IPA-enrolled")
       }
 
-      if $::foreman::selinux or (str2bool($::selinux) and $::foreman::selinux != false) {
+      if $facts['selinux'] {
         selboolean { ['allow_httpd_mod_auth_pam', 'httpd_dbus_sssd']:
           persistent => true,
           value      => 'on',

manifests/config/apache.pp

@@ -4,9 +4,6 @@
 #
 # $app_root::                 Root of the application.
 #
-# $listen_on_interface::      Specify which interface to bind passenger to.
-#                             Defaults to all interfaces.
-#
 # $passenger_ruby::           Path to Ruby interpreter
 #
 # $priority::                 Apache vhost priority
@@ -46,14 +43,6 @@
 # $foreman_url::              The URL Foreman should be reachable under. Used for loading the application
 #                             on startup rather than on demand.
 #
-# $keepalive::                Enable KeepAlive setting of Apache?
-#
-# $max_keepalive_requests::   MaxKeepAliveRequests setting of Apache
-#                             (Number of requests allowed on a persistent connection)
-#
-# $keepalive_timeout::        KeepAliveTimeout setting of Apache
-#                             (Seconds the server will wait for subsequent requests on a persistent connection)
-#
 # $access_log_format::        Apache log format to use
 #
 # $ipa_authentication::       Whether to install support for IPA authentication
@@ -67,7 +56,6 @@
 class foreman::config::apache(
   Boolean $passenger = $::foreman::passenger,
   Stdlib::Absolutepath $app_root = $::foreman::app_root,
-  Optional[String] $listen_on_interface = $::foreman::passenger_interface,
   Optional[String] $passenger_ruby = $::foreman::passenger_ruby,
   String $priority = $::foreman::vhost_priority,
   Stdlib::Fqdn $servername = $::foreman::servername,
@@ -85,19 +73,16 @@
   Stdlib::Absolutepath $ssl_key = $::foreman::server_ssl_key,
   Variant[Enum[''], Stdlib::Absolutepath] $ssl_crl = $::foreman::server_ssl_crl,
   Optional[String] $ssl_protocol = $::foreman::server_ssl_protocol,
+  Enum['none','optional','require','optional_no_ca'] $ssl_verify_client = $::foreman::server_ssl_verify_client,
   String $user = $::foreman::user,
   Boolean $passenger_prestart = $::foreman::passenger_prestart,
   Integer[0] $passenger_min_instances = $::foreman::passenger_min_instances,
   Integer[0] $passenger_start_timeout = $::foreman::passenger_start_timeout,
   Stdlib::HTTPUrl $foreman_url = $::foreman::foreman_url,
-  Boolean $keepalive = $::foreman::keepalive,
-  Integer[0] $max_keepalive_requests = $::foreman::max_keepalive_requests,
-  Integer[0] $keepalive_timeout = $::foreman::keepalive_timeout,
   Optional[String] $access_log_format = undef,
   Boolean $ipa_authentication = $::foreman::ipa_authentication,
   Hash[String, Any] $http_vhost_options = {},
   Hash[String, Any] $https_vhost_options = {},
-  Optional[Boolean] $selinux = $::foreman::selinux,
 ) {
   $docroot = "${app_root}/public"
   $suburi_parts = split($foreman_url, '/')
@@ -184,7 +169,7 @@
       ],
     }
 
-    if $selinux or ($facts['selinux'] and $selinux != false) {
+    if $facts['selinux'] {
       selboolean { 'httpd_can_network_connect':
         persistent => true,
         value      => 'on',
@@ -202,13 +187,6 @@
     include ::apache::mod::auth_kerb
   }
 
-  # Check the value in case the interface doesn't exist, otherwise listen on all interfaces
-  if $listen_on_interface and $listen_on_interface in split($::interfaces, ',') {
-    $listen_interface = fact("ipaddress_${listen_on_interface}")
-  } else {
-    $listen_interface = undef
-  }
-
   file { "${apache::confd_dir}/${priority}-foreman.d":
     ensure  => 'directory',
     owner   => 'root',
@@ -219,23 +197,19 @@
   }
 
   apache::vhost { 'foreman':
-    add_default_charset    => 'UTF-8',
-    docroot                => $docroot,
-    manage_docroot         => false,
-    ip                     => $listen_interface,
-    options                => ['SymLinksIfOwnerMatch'],
-    port                   => $server_port,
-    priority               => $priority,
-    servername             => $servername,
-    serveraliases          => $serveraliases,
-    keepalive              => bool2str($keepalive, 'on', 'off'),
-    max_keepalive_requests => $max_keepalive_requests,
-    keepalive_timeout      => $keepalive_timeout,
-    access_log_format      => $access_log_format,
-    additional_includes    => ["${::apache::confd_dir}/${priority}-foreman.d/*.conf"],
-    use_optional_includes  => true,
-    custom_fragment        => $custom_fragment,
-    *                      => $vhost_http_internal_options + $http_vhost_options,
+    add_default_charset   => 'UTF-8',
+    docroot               => $docroot,
+    manage_docroot        => false,
+    options               => ['SymLinksIfOwnerMatch'],
+    port                  => $server_port,
+    priority              => $priority,
+    servername            => $servername,
+    serveraliases         => $serveraliases,
+    access_log_format     => $access_log_format,
+    additional_includes   => ["${::apache::confd_dir}/${priority}-foreman.d/*.conf"],
+    use_optional_includes => true,
+    custom_fragment       => $custom_fragment,
+    *                     => $vhost_http_internal_options + $http_vhost_options,
   }
 
   if $ssl {
@@ -257,35 +231,31 @@
     }
 
     apache::vhost { 'foreman-ssl':
-      add_default_charset    => 'UTF-8',
-      docroot                => $docroot,
-      manage_docroot         => false,
-      ip                     => $listen_interface,
-      options                => ['SymLinksIfOwnerMatch'],
-      port                   => $server_ssl_port,
-      priority               => $priority,
-      servername             => $servername,
-      serveraliases          => $serveraliases,
-      ssl                    => true,
-      ssl_cert               => $ssl_cert,
-      ssl_certs_dir          => $ssl_certs_dir,
-      ssl_key                => $ssl_key,
-      ssl_chain              => $ssl_chain,
-      ssl_ca                 => $ssl_ca,
-      ssl_crl                => $ssl_crl_real,
-      ssl_crl_check          => $ssl_crl_check,
-      ssl_protocol           => $ssl_protocol,
-      ssl_verify_client      => 'optional',
-      ssl_options            => '+StdEnvVars +ExportCertData',
-      ssl_verify_depth       => '3',
-      keepalive              => bool2str($keepalive, 'on', 'off'),
-      max_keepalive_requests => $max_keepalive_requests,
-      keepalive_timeout      => $keepalive_timeout,
-      access_log_format      => $access_log_format,
-      additional_includes    => ["${::apache::confd_dir}/${priority}-foreman-ssl.d/*.conf"],
-      use_optional_includes  => true,
-      custom_fragment        => $custom_fragment,
-      *                      => $vhost_https_internal_options + $https_vhost_options,
+      add_default_charset   => 'UTF-8',
+      docroot               => $docroot,
+      manage_docroot        => false,
+      options               => ['SymLinksIfOwnerMatch'],
+      port                  => $server_ssl_port,
+      priority              => $priority,
+      servername            => $servername,
+      serveraliases         => $serveraliases,
+      ssl                   => true,
+      ssl_cert              => $ssl_cert,
+      ssl_certs_dir         => $ssl_certs_dir,
+      ssl_key               => $ssl_key,
+      ssl_chain             => $ssl_chain,
+      ssl_ca                => $ssl_ca,
+      ssl_crl               => $ssl_crl_real,
+      ssl_crl_check         => $ssl_crl_check,
+      ssl_protocol          => $ssl_protocol,
+      ssl_verify_client     => $ssl_verify_client,
+      ssl_options           => '+StdEnvVars +ExportCertData',
+      ssl_verify_depth      => '3',
+      access_log_format     => $access_log_format,
+      additional_includes   => ["${::apache::confd_dir}/${priority}-foreman-ssl.d/*.conf"],
+      use_optional_includes => true,
+      custom_fragment       => $custom_fragment,
+      *                     => $vhost_https_internal_options + $https_vhost_options,
     }
   }
 }

manifests/database.pp

@@ -1,12 +1,10 @@
 # Set up the foreman database
 class foreman::database {
   if $::foreman::db_manage {
-    $db_class = "foreman::database::${::foreman::db_type}"
-
-    contain $db_class
+    contain foreman::database::postgresql
 
     if $::foreman::db_manage_rake {
-      Class[$db_class] ~> Foreman_config_entry['db_pending_migration']
+      Class['foreman::database::postgresql'] ~> Foreman::Rake['db:migrate']
     }
   }
 
@@ -17,15 +15,15 @@
       'SEED_ADMIN_FIRST_NAME' => $::foreman::initial_admin_first_name,
       'SEED_ADMIN_LAST_NAME'  => $::foreman::initial_admin_last_name,
       'SEED_ADMIN_EMAIL'      => $::foreman::initial_admin_email,
+      'SEED_ADMIN_LOCALE'     => $::foreman::initial_admin_locale,
+      'SEED_ADMIN_TIMEZONE'   => $::foreman::initial_admin_timezone,
       'SEED_ORGANIZATION'     => $::foreman::initial_organization,
       'SEED_LOCATION'         => $::foreman::initial_location,
     }
 
-    foreman_config_entry { 'db_pending_migration':
-      value => false,
-      dry   => true,
+    foreman::rake { 'db:migrate':
+      unless => '/usr/sbin/foreman-rake db:abort_if_pending_migrations',
     }
-    ~> foreman::rake { 'db:migrate': }
     ~> foreman_config_entry { 'db_pending_seed':
       value => false,
       dry   => true,