Merge pull request puppetlabs#415 from apenney/rhel7

Ashley Penney · Ashley Penney · commit 78bbe0d947f6 · 2014-05-13T15:02:56.000-04:00
[WIP] Fixes to tests and RHEL7 support.
diff --git a/README.md b/README.md
@@ -288,6 +288,9 @@ This setting can be used to override the default postgresql PL/perl package name
 ####`python_package_name`
 This setting can be used to override the default postgresql Python package name. If not specified, the module will use whatever package name is the default for your OS distro.
 
+####`service_ensure`
+This setting can be used to override the default postgresql service ensure status. If not specified, the module will use `ensure` instead.
+
 ####`service_name`
 This setting can be used to override the default postgresql service name. If not specified, the module will use whatever service name is the default for your OS distro.
 
@@ -837,11 +840,17 @@ Works with versions of PostgreSQL from 8.1 through 9.2.
 Current it is only actively tested with the following operating systems:
 
 * Debian 6.x and 7.x
-* Centos 5.x and 6.x
-* Ubuntu 10.04 and 12.04
+* Centos 5.x, 6.x, and 7.x.
+* Ubuntu 10.04 and 12.04, 14.04
 
 Although patches are welcome for making it work with other OS distros, it is considered best effort.
 
+### RHEL7
+
+Currently the following features are unsupported:
+
+* Postgis (There is no existing postgis package for RHEL7, and it's not in EPEL7 yet.)
+
 Development
 ------------
 
diff --git a/manifests/globals.pp b/manifests/globals.pp
@@ -59,6 +59,7 @@
       },
       'Amazon' => '9.2',
       default => $::operatingsystemrelease ? {
+        /^7\./ => '9.2',
         /^6\./ => '8.4',
         /^5\./ => '8.1',
         default => undef,
@@ -91,6 +92,7 @@
   }
 
   $default_postgis_version = $globals_version ? {
+    '8.1' => '1.3.6',
     '8.4' => '1.5',
     '9.0' => '1.5',
     '9.1' => '1.5',
@@ -101,9 +103,12 @@
 
   # 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
+      }
     }
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,6 +1,6 @@
 # PRIVATE CLASS: do not use directly
 class postgresql::params inherits postgresql::globals {
-  $ensure                     = true
+  $ensure                     = present
   $version                    = $globals_version
   $postgis_version            = $globals_postgis_version
   $listen_addresses           = 'localhost'
@@ -11,6 +11,7 @@
   $ipv6acls                   = []
   $encoding                   = $encoding
   $locale                     = $locale
+  $service_ensure             = undef
   $service_provider           = $service_provider
   $manage_firewall            = $manage_firewall
   $manage_pg_hba_conf         = pick($manage_pg_hba_conf, true)
@@ -62,9 +63,11 @@
 
       $postgis_package_name = pick(
         $postgis_package_name,
-        versioncmp($postgis_version, '2') ? {
-          '-1'    => "postgis${package_version}",
-          default => "postgis2_${package_version}",
+        $::operatingsystemrelease ? {
+          /5/     => 'postgis',
+          default => versioncmp($postgis_version, '2') ? {
+            '-1'    => "postgis${package_version}",
+            default => "postgis2_${package_version}",}
         }
       )
     }
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -10,6 +10,7 @@
 
   $plperl_package_name        = $postgresql::params::plperl_package_name,
 
+  $service_ensure             = $postgresql::params::service_ensure,
   $service_name               = $postgresql::params::service_name,
   $service_provider           = $postgresql::params::service_provider,
   $service_status             = $postgresql::params::service_status,
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -104,7 +104,7 @@
 
     # RedHat-based systems hardcode some PG* variables in the init script, and need to be overriden
     # in /etc/sysconfig/pgsql/postgresql. Create a blank file so we can manage it with augeas later.
-    if ($::osfamily == 'RedHat') {
+    if ($::osfamily == 'RedHat') and ($::operatingsystemrelease !~ /^7/) {
       file { '/etc/sysconfig/pgsql/postgresql':
         ensure  => present,
         replace => false,
diff --git a/manifests/server/config_entry.pp b/manifests/server/config_entry.pp
@@ -26,16 +26,48 @@
     }
   }
 
-  if ($::osfamily == 'RedHat') {
-    if ($name == 'port') {
-      augeas { 'override PGPORT in /etc/sysconfig/pgsql/postgresql':
-        lens    => 'Shellvars.lns',
-        incl    => '/etc/sysconfig/pgsql/*',
-        context => '/files/etc/sysconfig/pgsql/postgresql',
-        changes => "set PGPORT $value",
-        require => File['/etc/sysconfig/pgsql/postgresql'],
-        notify  => Class['postgresql::server::service'],
-        before  => Class['postgresql::server::reload'],
+  # We have to handle ports in a weird and special way.  On Redhat we either
+  # have to create a systemd override for the port or update the sysconfig
+  # file.
+  if $::osfamily == 'RedHat' {
+    if $::operatingsystemrelease =~ /^7/ {
+      if $name == 'port' {
+        file { 'systemd-port-override':
+          ensure  => present,
+          path    => '/etc/systemd/system/postgresql.service',
+          owner   => root,
+          group   => root,
+          content => template('postgresql/systemd-port-override.erb'),
+          notify  => [ Exec['restart-systemd'], Class['postgresql::server::service'] ],
+          before  => Class['postgresql::server::reload'],
+        }
+        exec { 'restart-systemd':
+          command     => 'systemctl daemon-reload',
+          refreshonly => true,
+          path        => '/bin:/usr/bin:/usr/local/bin'
+        }
+      }
+    } else {
+      if $name == 'port' {
+        # We need to force postgresql to stop before updating the port
+        # because puppet becomes confused and is unable to manage the
+        # service appropriately.
+        exec { 'postgresql_stop':
+          command => "service ${::postgresql::server::service_name} stop",
+          onlyif  => "service ${::postgresql::server::service_name} status",
+          unless  => "grep 'PGPORT=${value}' /etc/sysconfig/pgsql/postgresql",
+          path    => '/sbin:/bin:/usr/bin:/usr/local/bin',
+          require => File['/etc/sysconfig/pgsql/postgresql'],
+        } ->
+        augeas { 'override PGPORT in /etc/sysconfig/pgsql/postgresql':
+          lens    => 'Shellvars.lns',
+          incl    => '/etc/sysconfig/pgsql/*',
+          context => '/files/etc/sysconfig/pgsql/postgresql',
+          changes => "set PGPORT ${value}",
+          require => File['/etc/sysconfig/pgsql/postgresql'],
+          notify  => Class['postgresql::server::service'],
+          before  => Class['postgresql::server::reload'],
+        }
       }
     }
   }
diff --git a/manifests/server/postgis.pp b/manifests/server/postgis.pp
@@ -17,6 +17,11 @@
     Package['postgresql-postgis']->
     Class['postgresql::server::service']->
     anchor { 'postgresql::server::postgis::end': }
+
+    if $postgresql::globals::manage_package_repo {
+      Class['postgresql::repo'] ->
+      Package['postgresql-postgis']
+    }
   } else {
     anchor { 'postgresql::server::postgis::start': }->
     Class['postgresql::server::service']->
diff --git a/manifests/server/reload.pp b/manifests/server/reload.pp
@@ -10,6 +10,7 @@
       command     => "service ${service_name} reload",
       onlyif      => $service_status,
       refreshonly => true,
+      require     => Class['postgresql::server::service'],
     }
   }
 }
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
@@ -1,14 +1,25 @@
 # PRIVATE CLASS: do not call directly
 class postgresql::server::service {
   $ensure           = $postgresql::server::ensure
+  $service_ensure   = $postgresql::server::service_ensure
   $service_name     = $postgresql::server::service_name
   $service_provider = $postgresql::server::service_provider
   $service_status   = $postgresql::server::service_status
   $user             = $postgresql::server::user
   $port             = $postgresql::server::port
   $default_database = $postgresql::server::default_database
 
-  $service_ensure = $ensure ? {
+  if $service_ensure {
+    $real_service_ensure = $service_ensure
+  } else {
+    $real_service_ensure = $ensure ? {
+      present => 'running',
+      absent  => 'stopped',
+      default => $ensure
+    }
+  }
+
+  $service_enable = $ensure ? {
     present => true,
     absent  => false,
     default => $ensure
@@ -17,15 +28,15 @@
   anchor { 'postgresql::server::service::begin': }
 
   service { 'postgresqld':
-    ensure    => $service_ensure,
+    ensure    => $real_service_ensure,
     name      => $service_name,
-    enable    => $service_ensure,
+    enable    => $service_enable,
     provider  => $service_provider,
     hasstatus => true,
     status    => $service_status,
   }
 
-  if($service_ensure) {
+  if $real_service_ensure == 'running' {
     # This blocks the class before continuing if chained correctly, making
     # sure the service really is 'up' before continuing.
     #
diff --git a/spec/acceptance/postgis_spec.rb b/spec/acceptance/postgis_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'postgresql::server::postgis:' do
+describe 'postgresql::server::postgis:', :unless => fact('operatingsystem') == 'RedHat' && fact('operatingsystemrelease') == '7.0' do
   after :all do
     # Cleanup after tests have ran, remove both postgis and server as postgis
     # pulls in the server based packages.
@@ -18,6 +18,7 @@ class { 'postgresql::server::postgis':
 
   it 'test loading class with no parameters' do
     pp = <<-EOS.unindent
+      class { 'postgresql::globals': manage_package_repo => true }
       class { 'postgresql::server': }
       class { 'postgresql::server::postgis': }
     EOS
diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb
@@ -2,16 +2,30 @@
 
 # Hack around the fact that so far only Ubuntu 14.04 seems to have moved this
 # file.  Can revisit if everyone else gets clever.
-if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
-  pghba_file = '/etc/postgresql/9.3/main/pg_hba.conf'
+
+case fact('operatingsystem')
+when 'Ubuntu'
+  case fact('operatingsystemrelease')
+  when '14.04'
+    pghba_file = '/etc/postgresql/9.3/main/pg_hba.conf'
+  when '12.04'
+    pghba_file = '/etc/postgresql/9.1/main/pg_hba.conf'
+  end
 else
   pghba_file = '/var/lib/pgsql/data/pg_hba.conf'
 end
 
 describe 'server:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   after :all do
     # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
+    pp = <<-EOS.unindent
+      class { 'postgresql::server': ensure => absent } ->
+      class { 'postgresql::client': package_ensure => absent }
+    EOS
+    apply_manifest(pp, :catch_failures => true)
+    if fact('osfamily') == 'RedHat'
+      shell('rpm -qa | grep postgres | xargs rpm -e')
+    end
   end
 
   it 'test loading class with no parameters' do
@@ -70,15 +84,20 @@ class { 'postgresql::server':
       psql('--command="drop database postgresql_test_db" postgres', 'postgres')
       pp = <<-EOS.unindent
         class { 'postgresql::globals':
-          ensure              => absent,
           manage_package_repo => true,
           version             => '9.3',
         }
         class { 'postgresql::server':
           ensure => absent,
+        } ->
+        class { 'postgresql::client':
+          package_ensure => absent,
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
+      if fact('osfamily') == 'RedHat'
+        shell('rpm -qa | grep postgres | xargs rpm -e')
+      end
     end
 
     it 'perform installation and create a db' do
@@ -116,9 +135,14 @@ class { "postgresql::server": }
   context 'test deprecating non-default version of postgresql to postgresql::server' do
     after :all do
       pp = <<-EOS.unindent
+        class { 'postgresql::globals':
+          version => '9.3',
+        }
         class { 'postgresql::server':
           ensure  => absent,
-          version => '9.3',
+        } ->
+        class { 'postgresql::client':
+          package_ensure  => absent,
         }
       EOS
       apply_manifest(pp, :catch_failures => true)
@@ -127,6 +151,7 @@ class { 'postgresql::server':
     it 'raises a warning' do
       pp = <<-EOS.unindent
       class { 'postgresql::server':
+        ensure  => absent,
         version => '9.3',
       }
       EOS
@@ -138,7 +163,7 @@ class { 'postgresql::server':
     fact('osfamily') == 'Debian')
 
     context 'override locale and encoding' do
-      after :each do
+      before :each do
         apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
       end
 
@@ -183,6 +208,9 @@ class { "postgresql::server":
         }
       EOS
 
+      if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5'
+        shell('iptables -F')
+      end
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
diff --git a/spec/acceptance/validate_db_connection_spec.rb b/spec/acceptance/validate_db_connection_spec.rb
@@ -32,12 +32,22 @@ class { 'postgresql::server': }
     apply_manifest(pp, :catch_failures => true)
   end
 
+  it 'stops postgresql' do
+    # First we stop postgresql.
+    pp = <<-EOS
+      class { 'postgresql::server':
+        service_ensure => 'stopped',
+      }
+    EOS
+    apply_manifest(pp, :catch_failures => true)
+  end
+
   it 'should keep retrying if database is down' do
-    # So first we shut the db down, then background a startup routine with a
-    # sleep 10 in front of it. That way the tests should continue while
-    # the pause and db startup happens in the background.
-    shell("/etc/init.d/postgresql* stop")
-    shell('nohup bash -c "sleep 10; /etc/init.d/postgresql* start" > /dev/null 2>&1 &')
+    if fact('operatingsystem') == 'RedHat' && fact('operatingsystemrelease') =~ /^7/
+      shell('nohup bash -c "sleep 10; systemctl start `basename /usr/lib/systemd/system/postgres*`" > /dev/null 2>&1 &')
+    else
+      shell('nohup bash -c "sleep 10; /etc/init.d/postgresql* start" > /dev/null 2>&1 &')
+    end
 
     pp = <<-EOS.unindent
       postgresql::validate_db_connection { 'foo':
@@ -47,7 +57,6 @@ class { 'postgresql::server': }
         run_as        => 'postgres',
       }
     EOS
-
     apply_manifest(pp, :catch_failures => true)
   end
 
@@ -76,4 +85,13 @@ class { 'postgresql::server': }
 
     apply_manifest(pp, :expect_failures => true)
   end
+
+  it 'starts postgresql' do
+    pp = <<-EOS
+      class { 'postgresql::server':
+        service_ensure => 'running',
+      }
+    EOS
+    apply_manifest(pp, :catch_failures => true)
+  end
 end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
diff --git a/spec/unit/classes/server/initdb_spec.rb b/spec/unit/classes/server/initdb_spec.rb
diff --git a/spec/unit/classes/server_spec.rb b/spec/unit/classes/server_spec.rb
diff --git a/templates/systemd-port-override.erb b/templates/systemd-port-override.erb

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`command => "service ${service_name} reload",`
`11`	`11`	`onlyif => $service_status,`
`12`	`12`	`refreshonly => true,`
	`13`	`+ require => Class['postgresql::server::service'],`
`13`	`14`	`}`
`14`	`15`	`}`
`15`	`16`	`}`