Move RHEL specifics into RHEL case

NASA-AMMOS · Apr 3, 2024 · 1ec9257 · 1ec9257
1 parent cc45ffb
commit 1ec9257
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/puppet/modules/anms/manifests/docker.pp b/puppet/modules/anms/manifests/docker.pp
@@ -9,23 +9,25 @@
         ensure => 'absent',
         before => Package['docker-ce'],
       }
+      package { 'yum-utils':
+        ensure => 'installed',
+      }
+      file { '/etc/yum.repos.d/docker.repo':
+        ensure => 'absent',
+      }
+      exec { 'yum-repo-docker-ce':
+        path    => $facts['path'],
+        command => 'yum-config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo',
+        creates => '/etc/yum.repos.d/docker-ce.repo',
+        require => Package['yum-utils'],
+        before  => [Package['docker-ce'], Package['docker-buildx-plugin'], Package['docker-compose-plugin']],
+      }
     }
     default: {}
   }
 
-  package { 'yum-utils':
-    ensure  => 'installed',
-  }
-  file { '/etc/yum.repos.d/docker.repo':
-    ensure => 'absent',
-  }
-  exec { 'yum-repo-docker-ce':
-    path    => $facts['path'],
-    command => 'yum-config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo',
-    creates => '/etc/yum.repos.d/docker-ce.repo',
-  }
   package { ['docker-ce', 'docker-ce-cli', 'containerd.io', 'docker-buildx-plugin', 'docker-compose-plugin']:
-    require => Exec['yum-repo-docker-ce'],
+    ensure => 'installed',
   }
   service { 'docker':
     require => Package['docker-ce'],
@@ -41,4 +43,4 @@
     mode   => '0644',
     notify => Service['docker'],
   }
-}
+}