Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Fix ensure value for postgres
  Update postgres fact
  Use absolute includes, not relative ones

diff --git a/modules/debian_org/lib/facter/software.rb b/modules/debian_org/lib/facter/software.rb
index 5c07912..47fa46a 100644 (file)
--- a/modules/debian_org/lib/facter/software.rb
+++ b/modules/debian_org/lib/facter/software.rb
@@ -46,12 +46,9 @@ Facter.add("postfix") do
 end
 Facter.add("postgres") do
        setcode do
-               pg = (FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres") or
-               FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres") or
-               FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres") or
-               FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres") or
-               FileTest.exist?("/usr/lib/postgresql/9.1/bin/postgres") or
-               FileTest.exist?("/usr/lib/postgresql/9.2/bin/postgres"))
+               pg = (FileTest.exist?("/usr/lib/postgresql/9.1/bin/postgres") or
+               FileTest.exist?("/usr/lib/postgresql/9.4/bin/postgres") or
+               FileTest.exist?("/usr/lib/postgresql/9.6/bin/postgres"))
                if pg
                        true
                else

diff --git a/modules/postgres/manifests/init.pp b/modules/postgres/manifests/init.pp
index af2f206..534e21f 100644 (file)
--- a/modules/postgres/manifests/init.pp
+++ b/modules/postgres/manifests/init.pp
@@ -1,6 +1,6 @@
 class postgres {
        $ensure = ($::postgres) ? {
-               true    => 'ensure',
+               true    => 'present',
                default => 'absent'
        }
 

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 88397c0..7a733e6 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -257,21 +257,21 @@ class roles {
        }
 
        if has_role('search_backend') {
-               include search_backend
+               include roles::search_backend
        }
        if has_role('search_frontend') {
-               include search_frontend
+               include roles::search_frontend
        }
 
        if has_role('dgit_browse') {
-               include dgit_browse
+               include roles::dgit_browse
        }
        if has_role('dgit_git') {
-               include dgit_git
+               include roles::dgit_git
        }
 
        if $::hostname in [lw01, lw02, lw03, lw04] {
-               include snapshot
+               include roles::snapshot
        }
 
        if has_role('veyepar.debian.org') {