Merge pull request #168 from nikdoof/rhel_extras_repository

Use RHSM Repo ID as the default for the extras repo name on RHEL7
puppetlabs · Feb 21, 2018 · 5f9cb5c · 5f9cb5c
2 parents e7ad171 + 8f2f533
commit 5f9cb5c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -197,7 +197,7 @@
 
       # repo_opt to specify install_options for docker package
       if $::operatingsystem == 'RedHat' {
-        $repo_opt = '--enablerepo=rhel7-extras'
+        $repo_opt = '--enablerepo=rhel-7-server-extras-rpms'
       } elsif $::operatingsystem == 'CentOS' {
         $repo_opt = '--enablerepo=extras'
       } else {

diff --git a/spec/classes/docker_spec.rb b/spec/classes/docker_spec.rb
@@ -382,8 +382,9 @@
               'ensure'          => 'present',
               'source'          => 'https://get.docker.com/rpm/1.7.0/centos-7/RPMS/x86_64/docker-engine-1.7.0-1.el7.x86_64.rpm',
               'name'            => 'docker-engine',
-              'install_options' => /--enablerepo/
+              'install_options' => '--enablerepo=rhel-7-server-extras-rpms'
             )
+
           end
         end