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

diff --git a/modules/debian_org/manifests/apt_restricted.pp b/modules/debian_org/manifests/apt_restricted.pp
new file mode 100644 (file)
index 0000000..86d8561
--- /dev/null
+++ b/modules/debian_org/manifests/apt_restricted.pp
@@ -0,0 +1,7 @@
+class debian_org::apt_restricted {
+       site::aptrepo { 'db.debian.org.restricted':
+               url        => 'http://db.debian.org/debian-admin',
+               suite      => '${::lsbdistcodename}-restricted',
+               components => 'non-free',
+       }
+}

diff --git a/modules/hardware/manifests/raid.pp b/modules/hardware/manifests/raid.pp
index 1dac055..497971e 100644 (file)
--- a/modules/hardware/manifests/raid.pp
+++ b/modules/hardware/manifests/raid.pp
@@ -1,9 +1,7 @@
 class hardware::raid {
        include hardware::raid::proliant
 
-       if $::productname == 'PowerEdge 1950' {
-               include hardware::raid::dell
-       }
+       include hardware::raid::dell
 
        include hardware::raid::raidmpt
        include hardware::raid::megaraid_sas

diff --git a/modules/hardware/manifests/raid/dell.pp b/modules/hardware/manifests/raid/dell.pp
index a69997a..8e56c61 100644 (file)
--- a/modules/hardware/manifests/raid/dell.pp
+++ b/modules/hardware/manifests/raid/dell.pp
@@ -1,20 +1,29 @@
 class hardware::raid::dell {
+       if "$::manufacturer" == "Dell Inc." {
+               include debian_org::apt_restricted
+
+               package { 'srvadmin-server-cli':
+                       ensure  => installed,
+                       tag    => extra_repo,
+               }
+               package { 'srvadmin-storage-cli':
+                       ensure  => installed,
+                       tag    => extra_repo,
+               }
+               package { 'srvadmin-omcommon':
+                       ensure  => installed,
+                       tag    => extra_repo,
+               }
+               package { 'libssl1.0.0':
+                       ensure  => installed,
+                       tag    => extra_repo,
+               }
+
+       }
        site::aptrepo { 'jessie.dell':
-               url        => 'http://deb.debian.org/debian',
-               suite      => 'jessie',
-               components => 'main',
+               ensure => absent,
        }
        site::aptrepo { 'debian.restricted.dell':
-               url        => 'http://db.debian.org/debian-admin',
-               suite      => 'jessie-restricted',
-               components => 'non-free',
-       }
-
-       package { 'libssl1.0.0':
-               ensure  => installed,
-       }
-       package { 'srvadmin-storage-cli':
-               ensure  => installed,
-               tag    => extra_repo,
+               ensure => absent,
        }
 }

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,
+       }
 }

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 0360087..afc7091 100644 (file)
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,10 +1,9 @@
 class hardware::raid::proliant {
        if $::smartarraycontroller_hpsa or $::smartarraycontroller_cciss {
                site::aptrepo { 'debian.restricted':
-                       url        => 'http://db.debian.org/debian-admin',
-                       suite      => "${::lsbdistcodename}-restricted",
-                       components => 'non-free',
+                       ensure => absent,
                }
+               include debian_org::apt_restricted
 
                package { 'hpacucli':
                        ensure  => installed,