Install srvadmin foo on dell hosts, and move our restricted archive to debian_org...

[mirror/dsa-puppet.git] / modules / hardware / manifests / raid / megaraid_sas.pp

diff --git a/modules/hardware/manifests/raid/megaraid_sas.pp b/modules/hardware/manifests/raid/megaraid_sas.pp
index bac4511..e4bfee2 100644 (file)
--- a/modules/hardware/manifests/raid/megaraid_sas.pp
+++ b/modules/hardware/manifests/raid/megaraid_sas.pp
@@ -1,10 +1,6 @@
 class hardware::raid::megaraid_sas {
        if $::megaraid_sas {
-               site::aptrepo { 'debian.restricted.megaraid_sas':
-                       url        => 'http://db.debian.org/debian-admin',
-                       suite      => 'stretch-restricted',
-                       components => 'non-free',
-               }
+               include debian_org::apt_restricted
 
                package { 'megacli':
                        ensure  => installed,
@@ -15,9 +11,6 @@ class hardware::raid::megaraid_sas {
                        target => '/opt/MegaRAID/MegaCli/MegaCli64',
                }
        } else {
-               site::aptrepo { 'debian.restricted.megaraid_sas':
-                       ensure => absent,
-               }
                package { 'megacli':
                        ensure  => purged,
                }
@@ -25,4 +18,7 @@ class hardware::raid::megaraid_sas {
                        ensure => 'absent',
                }
        }
+       site::aptrepo { 'debian.restricted.megaraid_sas':
+               ensure => absent,
+       }
 }