(CLOUD-1673) Remove epel dependecny in docker (#127)

Author: sheenaajay

.fixtures.yml

@@ -1,7 +1,6 @@
 fixtures:
   forge_modules:
     stdlib: 'puppetlabs-stdlib'
-    epel: 'stahnma-epel'
     apt: 'puppetlabs-apt'
     translate: 'puppetlabs-translate'
   symlinks:

manifests/init.pp

@@ -434,7 +434,6 @@
   Optional[String] $execdriver                              = $docker::params::execdriver,
   Boolean $manage_package                                   = $docker::params::manage_package,
   Optional[String] $package_source                          = $docker::params::package_source,
-  Boolean $manage_epel                                      = $docker::params::manage_epel,
   Optional[String] $service_name                            = $docker::params::service_name,
   Array $docker_users                                       = [],
   String $docker_group                                      = $docker::params::docker_group,

manifests/params.pp

@@ -130,7 +130,6 @@
         }
       }
 
-      $manage_epel = false
       $service_name = $service_name_default
       $docker_group = $docker_group_default
       $socket_group = $socket_group_default
@@ -178,7 +177,6 @@
       $service_config_template    = 'docker/etc/sysconfig/docker.systemd.erb'
       $service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.erb'
       $use_upstream_package_source = true
-      $manage_epel = false
 
       $package_ce_source_location = "https://download.docker.com/linux/centos/${::operatingsystemmajrelease}/${::architecture}/${docker_ce_channel}"
       $package_ce_key_source = 'https://download.docker.com/linux/centos/gpg'
@@ -245,7 +243,6 @@
       }
     }
     default: {
-      $manage_epel = false
       $docker_group = $docker_group_default
       $socket_group = $socket_group_default
       $package_key_source = undef

manifests/repos.pp

@@ -69,12 +69,6 @@
           }
           Yumrepo['docker'] -> Package['docker']
         }
-        if ($::operatingsystem != 'Amazon') and ($::operatingsystem != 'Fedora') {
-          if ($docker::manage_epel == true) {
-            include 'epel'
-            Class['epel'] -> Package['docker']
-          }
-        }
       }
     }
     default: {}

metadata.json

@@ -10,7 +10,6 @@
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.24.0"},
     {"name":"puppetlabs/apt","version_requirement":">= 4.4.1"},
-    {"name":"stahnma/epel","version_requirement":">= 0.0.6"},
     {"name":"puppetlabs/translate","version_requirement":">= 0.0.1 < 1.1.0"}
   ],
   "data_provider": null,

spec/classes/docker_spec.rb

@@ -88,7 +88,6 @@
           let(:params) { {'use_upstream_package_source' => false } }
           it { should_not contain_apt__source('docker') }
           it { should_not contain_apt__pin('docker') }
-          it { should_not contain_class('epel') }
           it { should contain_package('docker') }
         end
 
@@ -406,13 +405,6 @@
           end
         end
 
-        context 'with no epel repo' do
-          let(:params) { {'manage_epel' => false } }
-          it { should_not contain_class('epel') }
-          it { should contain_package('docker').with_name('docker-ce').with_ensure('present') }
-          it { should_not contain_apt__source('docker') }
-          it { should_not contain_package('linux-image-extra-3.8.0-29-generic') }
-        end
       end
 
       it { should compile.with_all_deps }

spec/spec_helper_acceptance.rb

@@ -36,7 +36,6 @@
 
       on host, puppet('module', 'install', 'puppetlabs-stdlib', '--version', '4.24.0'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module', 'install', 'puppetlabs-apt', '--version', '4.4.1'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module', 'install', 'stahnma-epel'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module', 'install', 'puppetlabs-translate', '--version', '1.0.0' ), { :acceptable_exit_codes => [0,1] }
 
       # net-tools required for netstat utility being used by some tests