Fixed issues notified by Thomas.

manifests/auth.pp

@@ -29,16 +29,17 @@ class aes::auth (
   # Pick the right keytab for the current environment. We use the fqdn rather than 
   # $environment since the keys are tied to the domain name rather than what 
   # environment the machine is configured in.
-  if $facts[fqdn] == 'aes.edu.liu.se' {
+  if $facts[networking][fqdn] == 'aes.edu.liu.se' {
     # The AD service account for this key is: ida_sys002_srv
     $auth_keytab_data = $keytab_production
     $server_type = 'production'
-  } elsif $facts[fqdn] == 'aes-devel.edu.liu.se' {
+  } elsif $facts[networking][fqdn] == 'aes-devel.edu.liu.se' {
     # The AD service account for this key is: ida_sys004_srv
     $auth_keytab_data = $keytab_devel
     $server_type = 'devel'
   } else {
     $auth_keytab_data = undef
+    $server_type = 'devel'
   }
 
   # Note: We rely on Boost being installed by the broker. It seems Puppet does not like

manifests/auth_keydb.pp

@@ -12,9 +12,9 @@ class aes::auth_keydb {
   $keydb_service = 'aes_auth_keydb'
 
   # Figure out which certificate to use based on the hostname.
-  if $facts[fqdn] == 'aes.edu.liu.se' {
+  if $facts[networking][fqdn] == 'aes.edu.liu.se' {
     $server_type = 'production'
-  } elsif $facts[fqdn] == 'aes-devel.edu.liu.se' {
+  } elsif $facts[networking][fqdn] == 'aes-devel.edu.liu.se' {
     $server_type = 'devel'
   } else {
     $server_type = undef

manifests/broker.pp

@@ -22,9 +22,9 @@ class aes::broker {
   }
 
   # Figure out which certificate to use based on the hostname.
-  if $facts[fqdn] == 'aes.edu.liu.se' {
+  if $facts[networking][fqdn] == 'aes.edu.liu.se' {
     $server_type = 'production'
-  } elsif $facts[fqdn] == 'aes-devel.edu.liu.se' {
+  } elsif $facts[networking][fqdn] == 'aes-devel.edu.liu.se' {
     $server_type = 'devel'
   } else {
     $server_type = undef