Merge branch 'rhel7' of https://github.com/apenney/puppetlabs-postgresql into rhel7

Ashley Penney · Ashley Penney · commit bb26d47090c8 · 2014-05-13T20:25:19.000+02:00
diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb
@@ -208,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

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,9 @@ class { "postgresql::server":`
`208`	`208`	`}`
`209`	`209`	`EOS`
`210`	`210`
	`211`	`+ if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5'`
	`212`	`+ shell('iptables -F')`
	`213`	`+ end`
`211`	`214`	`apply_manifest(pp, :catch_failures => true)`
`212`	`215`	`apply_manifest(pp, :catch_changes => true)`
`213`	`216`	`end`