Skip to content

Commit

Permalink
rm easy_ipa::install_epel param
Browse files Browse the repository at this point in the history
This should be managed with a forge module. E.g. puppet/epel
  • Loading branch information
jhoblitt committed Oct 25, 2023
1 parent 65d4d47 commit 235d895
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 38 deletions.
9 changes: 0 additions & 9 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ The following parameters are available in the `easy_ipa` class:
* [`idstart`](#-easy_ipa--idstart)
* [`gssapi_no_negotiate`](#-easy_ipa--gssapi_no_negotiate)
* [`idmax`](#-easy_ipa--idmax)
* [`install_epel`](#-easy_ipa--install_epel)
* [`install_ipa_client`](#-easy_ipa--install_ipa_client)
* [`install_ipa_server`](#-easy_ipa--install_ipa_server)
* [`install_sssd`](#-easy_ipa--install_sssd)
Expand Down Expand Up @@ -263,14 +262,6 @@ Data type: `Variant[Integer,Undef]`

Default value: `undef`

##### <a name="-easy_ipa--install_epel"></a>`install_epel`

Data type: `Boolean`

(boolean) If true, then the epel repo is installed. The epel repo is usually required for sssd packages.

Default value: `true`

##### <a name="-easy_ipa--install_ipa_client"></a>`install_ipa_client`

Data type: `Boolean`
Expand Down
6 changes: 4 additions & 2 deletions examples/master.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
include cron # easy_ipa needs cron to be installed
require epel # provides kstart package on el
require cron # easy_ipa needs cron to be installed

class { 'easy_ipa':
Yumrepo <||>
-> class { 'easy_ipa':
ipa_role => 'master',
domain => 'rspec.example.lan',
admin_password => 'rspecrspec123',
Expand Down
4 changes: 0 additions & 4 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@
# @param idmax
# (integer) From the IPA man pages: "The max value for the IDs range (default: idstart+199999)".
#
# @param install_epel
# (boolean) If true, then the epel repo is installed. The epel repo is usually required for sssd packages.
#
# @param install_ipa_client
# (boolean) If true, then the IPA client packages are installed if the parameter 'ipa_role' is set to 'client'.
#
Expand Down Expand Up @@ -146,7 +143,6 @@
Variant[Pattern,Undef] $gssapi_no_negotiate = undef,
Integer[10000] $idstart = (fqdn_rand('10737') + 10000),
Variant[Integer,Undef] $idmax = undef,
Boolean $install_epel = true,
Boolean $install_ipa_client = true,
Boolean $install_ipa_server = true,
Boolean $install_sssd = true,
Expand Down
8 changes: 0 additions & 8 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
# @summary Manage easy_ipa install
#
class easy_ipa::install {
if $easy_ipa::install_epel and $facts['os']['family'] == 'RedHat' {
ensure_resource(
'package',
'epel-release',
{ 'ensure' => 'present' },
)
}

# Note: sssd.conf handled by ipa-server-install.
if $easy_ipa::install_sssd {
contain 'easy_ipa::install::sssd'
Expand Down
15 changes: 0 additions & 15 deletions spec/classes/ipa_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@
it { is_expected.to contain_package('sssd-common') }

it { is_expected.not_to contain_package('ipa-client') }

case facts[:os]['family']
when 'RedHat'
it { is_expected.to contain_package('epel-release') }
end
end

context 'with idmax' do
Expand Down Expand Up @@ -231,11 +226,6 @@
it { is_expected.to contain_package('sssd-common') }

it { is_expected.not_to contain_package('ipa-client') }

case facts[:os]['family']
when 'RedHat'
it { is_expected.to contain_package('epel-release') }
end
end

context 'configure_ssh' do
Expand Down Expand Up @@ -334,11 +324,6 @@
it { is_expected.not_to contain_package('ipa-server-dns') }
it { is_expected.not_to contain_package('bind-dyndb-ldap') }
it { is_expected.not_to contain_package('ipa-server') }

case facts[:os]['family']
when 'RedHat'
it { is_expected.to contain_package('epel-release') }
end
end

context 'configure_ssh' do
Expand Down
1 change: 1 addition & 0 deletions spec/support/acceptance/setup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
# https://cstan.io/?p=12175&lang=en
on host, 'yum update -y'
install_puppet_module_via_pmt_on(host, 'puppet/cron')
install_puppet_module_via_pmt_on(host, 'puppet/epel')
end

0 comments on commit 235d895

Please sign in to comment.