Split out redhat-isms properly

osuosl · Sep 20, 2012 · 9a41ee9 · 9a41ee9
1 parent 93dff10
commit 9a41ee9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/manifests/ganeti.pp b/manifests/ganeti.pp
@@ -70,6 +70,11 @@
       enable  => true,
       require => File["/etc/init.d/ganeti"],
   }
+
+  case $osfamily {
+    redhat:   { include ganeti_tutorial::redhat::ganeti }
+    default:  { }
+  }
 }
 
 class ganeti_tutorial::ganeti::initialize inherits ganeti_tutorial::ganeti::install {
@@ -81,6 +86,10 @@
         Exec["install-ganeti"], Exec["ifup_br0"], Exec["ifup_eth2"],
         Exec["modprobe_drbd"], ],
   }
+  case $osfamily {
+    redhat:   { include ganeti_tutorial::redhat::ganeti::initialize }
+    default:  { }
+  }
 }
 
 class ganeti_tutorial::ganeti::git inherits ganeti_tutorial::ganeti::install {

diff --git a/manifests/htools.pp b/manifests/htools.pp
@@ -28,6 +28,10 @@
           Package["libghc6-curl-dev"], Ganeti_tutorial::Unpack["htools"],];
     }
   }
+  case $osfamily {
+    redhat:   { include ganeti_tutorial::redhat::htools }
+    default:  { }
+  }
 }
 
 class ganeti_tutorial::htools::install_deps {

diff --git a/manifests/redhat.pp b/manifests/redhat.pp
@@ -1,8 +1,5 @@
 class ganeti_tutorial::redhat {
   include ganeti_tutorial::redhat::drbd
-  include ganeti_tutorial::redhat::htools
-  include ganeti_tutorial::redhat::ganeti
-  include ganeti_tutorial::redhat::ganeti::initialize
   include ganeti_tutorial::redhat::kvm
 
   yumrepo {
@@ -51,7 +48,7 @@
 
 }
 
-class ganeti_tutorial::redhat::htools inherits ganeti_tutorial::htools {
+class ganeti_tutorial::redhat::htools inherits ganeti_tutorial::htools::install_deps {
   Package["libghc6-curl-dev"] {
     require => Yumrepo["ganeti"],
   }