Showing with 47 additions and 45 deletions.
  1. +13 −0 CHANGELOG.md
  2. +5 −7 manifests/cli/params.pp
  3. +9 −12 manifests/params.pp
  4. +5 −7 manifests/plugin/ovirt_provision/params.pp
  5. +5 −7 manifests/plugin/puppetdb/params.pp
  6. +5 −7 manifests/plugin/tasks/params.pp
  7. +5 −5 metadata.json
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## [12.2.0](https://github.com/theforeman/puppet-foreman/tree/12.2.0) (2019-06-12)

[Full Changelog](https://github.com/theforeman/puppet-foreman/compare/12.1.0...12.2.0)

**Implemented enhancements:**

- Use system packages on EL8 [\#734](https://github.com/theforeman/puppet-foreman/pull/734) ([ekohl](https://github.com/ekohl))

**Merged pull requests:**

- allow newer versions of dependencies [\#737](https://github.com/theforeman/puppet-foreman/pull/737) ([mmoll](https://github.com/mmoll))
- Allow `puppetlabs/stdlib` 6.x [\#732](https://github.com/theforeman/puppet-foreman/pull/732) ([alexjfisher](https://github.com/alexjfisher))

## [12.1.0](https://github.com/theforeman/puppet-foreman/tree/12.1.0) (2019-05-21)

[Full Changelog](https://github.com/theforeman/puppet-foreman/compare/12.0.0...12.1.0)
Expand Down
12 changes: 5 additions & 7 deletions manifests/cli/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
# OS specific paths
case $::osfamily {
'RedHat': {
case $::operatingsystem {
'fedora': {
$hammer_plugin_prefix = 'rubygem-hammer_cli_'
}
default: {
$hammer_plugin_prefix = 'tfm-rubygem-hammer_cli_'
}
# We use system packages except on EL7
if versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
$hammer_plugin_prefix = 'rubygem-hammer_cli_'
} else {
$hammer_plugin_prefix = 'tfm-rubygem-hammer_cli_'
}
}
'Debian': {
Expand Down
21 changes: 9 additions & 12 deletions manifests/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,15 @@
# OS specific paths
case $::osfamily {
'RedHat': {
case $::operatingsystem {
'fedora': {
$passenger_ruby = undef
$passenger_ruby_package = undef
$plugin_prefix = 'rubygem-foreman_'
}
default: {
# add passenger::install::scl as EL uses SCL on Foreman 1.2+
$passenger_ruby = '/usr/bin/tfm-ruby'
$passenger_ruby_package = 'tfm-rubygem-passenger-native'
$plugin_prefix = 'tfm-rubygem-foreman_'
}
# We use system packages except on EL7
if versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
$passenger_ruby = undef
$passenger_ruby_package = undef
$plugin_prefix = 'rubygem-foreman_'
} else {
$passenger_ruby = '/usr/bin/tfm-ruby'
$passenger_ruby_package = 'tfm-rubygem-passenger-native'
$plugin_prefix = 'tfm-rubygem-foreman_'
}
}
'Debian': {
Expand Down
12 changes: 5 additions & 7 deletions manifests/plugin/ovirt_provision/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
class foreman::plugin::ovirt_provision::params {
case $::osfamily {
'RedHat': {
case $::operatingsystem {
'fedora': {
$package = 'rubygem-ovirt_provision_plugin'
}
default: {
$package = 'tfm-rubygem-ovirt_provision_plugin'
}
# We use system packages except on EL7
if versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
$package = 'rubygem-ovirt_provision_plugin'
} else {
$package = 'tfm-rubygem-ovirt_provision_plugin'
}
}
'Debian': {
Expand Down
12 changes: 5 additions & 7 deletions manifests/plugin/puppetdb/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@

case $::osfamily {
'RedHat': {
case $::operatingsystem {
'fedora': {
$package = 'rubygem-puppetdb_foreman'
}
default: {
$package = 'tfm-rubygem-puppetdb_foreman'
}
# We use system packages except on EL7
if versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
$package = 'rubygem-puppetdb_foreman'
} else {
$package = 'tfm-rubygem-puppetdb_foreman'
}
}
'Debian': {
Expand Down
12 changes: 5 additions & 7 deletions manifests/plugin/tasks/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
$cron_line = '45 19 * * *'
case $::osfamily {
'RedHat': {
case $::operatingsystem {
'fedora': {
$package = 'rubygem-foreman-tasks'
}
default: {
$package = 'tfm-rubygem-foreman-tasks'
}
# We use system packages except on EL7
if versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
$package = 'rubygem-foreman-tasks'
} else {
$package = 'tfm-rubygem-foreman-tasks'
}
}
'Debian': {
Expand Down
10 changes: 5 additions & 5 deletions metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theforeman-foreman",
"version": "12.1.0",
"version": "12.2.0",
"author": "theforeman",
"summary": "Foreman server configuration",
"license": "GPL-3.0+",
Expand All @@ -14,27 +14,27 @@
"dependencies": [
{
"name": "puppetlabs/apache",
"version_requirement": ">= 2.0.0 < 5.0.0"
"version_requirement": ">= 2.0.0 < 6.0.0"
},
{
"name": "puppetlabs/apt",
"version_requirement": ">= 2.0.0 < 8.0.0"
},
{
"name": "puppetlabs/concat",
"version_requirement": ">= 1.0.0 < 6.0.0"
"version_requirement": ">= 1.0.0 < 7.0.0"
},
{
"name": "puppetlabs/postgresql",
"version_requirement": ">= 4.2.0 < 7.0.0"
},
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 4.25.0 < 6.0.0"
"version_requirement": ">= 4.25.0 < 7.0.0"
},
{
"name": "puppet/extlib",
"version_requirement": ">= 3.0.0 < 4.0.0"
"version_requirement": ">= 3.0.0 < 5.0.0"
}
],
"requirements": [
Expand Down