split base from init.pp, and simplify the variable declaration and lookup

by merging bcd::variable with the main class (so we can directly say bcd::login instead of using 
bcd::variable )

1 files changed, 3 insertions, 42 deletions

diff --git a/modules/bcd/manifests/init.pp b/modules/bcd/manifests/init.pp
index 2dfd88df..81f0ef1c 100644
--- a/modules/bcd/manifests/init.pp
+++ b/modules/bcd/manifests/init.pp
@@ -1,44 +1,5 @@
 class bcd {
-    class variable {
-        $bcd_login = 'bcd'
-        $bcd_home = '/home/bcd'
-	$public_isos = "$bcd_home/public_html/isos"
-	$isomakers_group = 'mga-iso_makers'
-    }
-
-    class base inherits variable {
-	include sudo
-
-        group { $bcd_login: }
-
-        user { $bcd_login:
-            home       => $bcd_home,
-            managehome => true,
-            comment    => "User for creating ISOs",
-	    }
-
-	file { $public_isos:
-	    ensure => directory,
-	    owner => $bcd_login,
-	    group => $bcd_login,
-	    mode => 755,
-	}
-
-        #package { bcd:
-	#    ensure => 'installed',
-        #}
-
-        sudo::sudoers_config { "bcd":
-	    content => template("bcd/sudoers.bcd")
-        }
-
-	file { "/var/lib/bcd":
-	    ensure => directory,
-	    owner => $bcd_login,
-	    group => $bcd_login,
-	    mode => 755,
-	}
-
-    }
-
+    $login = 'bcd'
+    $home = '/home/bcd'
+    $public_isos = "$home/public_html/isos"
 }