diff --git a/README.md b/README.md index e197a886..28b8a3dc 100644 --- a/README.md +++ b/README.md @@ -778,11 +778,9 @@ The name of the package to be installed via the provider ##### `provider` The supported installation modes for this module -* yum * bundle * puppet_gem * gem -* zypper ##### `install_options` Options to pass to the `provider` declaration diff --git a/manifests/install.pp b/manifests/install.pp index eadeeef4..f997738f 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -19,7 +19,6 @@ $real_package_name = 'ruby22-r10k' } } - 'yum': { $real_package_name = 'rubygem-r10k' } default: { $real_package_name = 'r10k' } } } else { @@ -30,7 +29,7 @@ 'bundle': { include r10k::install::bundle } - 'puppet_gem', 'gem', 'openbsd', 'yum', 'zypper': { + 'puppet_gem', 'gem', 'openbsd': { if $provider == 'gem' { class { 'r10k::install::gem': manage_ruby_dependency => $manage_ruby_dependency, @@ -63,6 +62,6 @@ } } - default: { fail("${module_name}: ${provider} is not supported. Valid values are: 'gem', 'puppet_gem', 'bundle', 'openbsd', 'yum', 'zypper'") } + default: { fail("${module_name}: ${provider} is not supported. Valid values are: 'gem', 'puppet_gem', 'bundle', 'openbsd'") } } } diff --git a/spec/classes/install_spec.rb b/spec/classes/install_spec.rb index 01791461..ecd0c007 100644 --- a/spec/classes/install_spec.rb +++ b/spec/classes/install_spec.rb @@ -149,47 +149,6 @@ it { is_expected.to contain_class('r10k::install::bundle') } it { is_expected.not_to contain_package('r10k') } end - - context 'with yum provider' do - let :params do - { - install_options: '', - keywords: '', - manage_ruby_dependency: 'declare', - package_name: 'rubygem-r10k', - provider: 'yum', - version: 'latest', - puppet_master: true - } - end - - it { is_expected.not_to contain_class('git') } - it { is_expected.to contain_package('rubygem-r10k') } - end - end - end - - context 'with zypper provider' do - let :params do - { - install_options: '', - keywords: '', - manage_ruby_dependency: 'declare', - package_name: 'r10k', - provider: 'zypper', - version: 'latest', - puppet_master: true - } end - let :facts do - { - osfamily: 'Suse', - operatingsystemrelease: '11.3', - puppetversion: Puppet.version - } - end - - it { is_expected.not_to contain_class('git') } - it { is_expected.to contain_package('r10k') } end end