From 16ce34d7a040fc6bcf7444156cb14d847026d563 Mon Sep 17 00:00:00 2001
From: Nick Chappell <nick@intronic.org>
Date: Thu, 3 Jul 2014 20:36:38 -0700
Subject: [PATCH] Changed includes and a variable name.

---
 manifests/server/install.pp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/manifests/server/install.pp b/manifests/server/install.pp
index 656b68d..067cbd3 100644
--- a/manifests/server/install.pp
+++ b/manifests/server/install.pp
@@ -13,7 +13,7 @@
 
 class icinga2::server::install inherits icinga2::server {
   
-  include icinga2::params
+  include icinga2::server
   #Apply our classes in the right order. Use the squiggly arrows (~>) to ensure that the 
   #class left is applied before the class on the right and that it also refreshes the 
   #class on the right.
@@ -28,7 +28,7 @@ class icinga2::server::install inherits icinga2::server {
 
 class icinga2::server::install::repos inherits icinga2::server {
 
-  include icinga2::params
+  include icinga2::server
 
   case $operatingsystem {
     #Red Hat/CentOS systems:
@@ -67,7 +67,7 @@ class icinga2::server::install::repos inherits icinga2::server {
 #Install packages for Icinga 2:
 class icinga2::server::install::packages inherits icinga2::server {
 
-  include icinga2::params
+  include icinga2::server
   
   #Install the Icinga 2 package
   package {$icinga2_server_package:
@@ -76,7 +76,7 @@ class icinga2::server::install::packages inherits icinga2::server {
   }
 
   #Pick the right DB lib package name based on the database type the user selected:
-  case $icinga2::server::server_db_type {
+  case $server_db_type {
     #MySQL:
     'mysql': { $icinga2_server_db_connector_package = 'icinga2-ido-mysql'}
     #Postgres:
@@ -96,13 +96,11 @@ class icinga2::server::install::packages inherits icinga2::server {
 #This class contains exec resources
 class icinga2::server::install::execs inherits icinga2::server {
 
-  include icinga2::params
+  include icinga2::server
 
   case $server_db_type {
     #Schema loading for MySQL:
-    'mysql': {
-
-    }
+    'mysql': { }
     #Schema loading for Postgres:
     'pgsql': {
       exec { 'postgres_schema_load':