Merge pull request puppetlabs#501 from cfeskens/allow-rhel7-repo

Morgan Haskel · Morgan Haskel · commit 5c56e11ea490 · 2014-10-02T12:23:34.000-05:00
postgresql.org now has a RHEL7 repo available
diff --git a/manifests/globals.pp b/manifests/globals.pp
@@ -109,11 +109,8 @@
 
   # Setup of the repo only makes sense globally, so we are doing this here.
   if($manage_package_repo) {
-    # Workaround the lack of RHEL7 repositories for now.
-    if ! ($::operatingsystem == 'RedHat' and $::operatingsystemrelease =~ /^7/) {
-      class { 'postgresql::repo':
-        version => $globals_version
-      }
+    class { 'postgresql::repo':
+      version => $globals_version
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,8 @@`
`109`	`109`
`110`	`110`	`# Setup of the repo only makes sense globally, so we are doing this here.`
`111`	`111`	`if($manage_package_repo) {`
`112`		`- # Workaround the lack of RHEL7 repositories for now.`
`113`		`- if ! ($::operatingsystem == 'RedHat' and $::operatingsystemrelease =~ /^7/) {`
`114`		`- class { 'postgresql::repo':`
`115`		`- version => $globals_version`
`116`		`- }`
	`112`	`+ class { 'postgresql::repo':`
	`113`	`+ version => $globals_version`
`117`	`114`	`}`
`118`	`115`	`}`
`119`	`116`	`}`