Added puppetlabs-firewall (required by puppetlabs-postgresql), updated the other modules.

modules/postgresql/manifests/globals.pp

@@ -8,8 +8,10 @@ class postgresql::globals (
   $contrib_package_name = undef,
   $devel_package_name   = undef,
   $java_package_name    = undef,
+  $perl_package_name    = undef,
   $plperl_package_name  = undef,
   $python_package_name  = undef,
+  $postgis_package_name = undef,
 
   $service_name         = undef,
   $service_provider     = undef,
@@ -33,6 +35,7 @@ class postgresql::globals (
   $group                = undef,
 
   $version              = undef,
+  $postgis_version      = undef,
 
   $needs_initdb         = undef,
 
@@ -56,6 +59,7 @@ class postgresql::globals (
       },
       'Amazon' => '9.2',
       default => $::operatingsystemrelease ? {
+        /^7\./ => '9.2',
         /^6\./ => '8.4',
         /^5\./ => '8.1',
         default => undef,
@@ -83,12 +87,28 @@ class postgresql::globals (
     default => undef,
   }
   $globals_version = pick($version, $default_version, 'unknown')
+  if($globals_version == 'unknown') {
+    fail('No preferred version defined or automatically detected.')
+  }
+
+  $default_postgis_version = $globals_version ? {
+    '8.1' => '1.3.6',
+    '8.4' => '1.5',
+    '9.0' => '1.5',
+    '9.1' => '1.5',
+    '9.2' => '2.0',
+    '9.3' => '2.1',
+  }
+  $globals_postgis_version = pick($postgis_version, $default_postgis_version)
 
   # Setup of the repo only makes sense globally, so we are doing this here.
   if($manage_package_repo) {
-    class { 'postgresql::repo':
-      ensure  => $ensure,
-      version => $globals_version
+    # Workaround the lack of RHEL7 repositories for now.
+    if ! ($::operatingsystem == 'RedHat' and $::operatingsystemrelease =~ /^7/) {
+      class { 'postgresql::repo':
+        ensure  => $ensure,
+        version => $globals_version
+      }
     }
   }
 }