Merge pull request #837 from megianni/master

DavidS · DavidS · commit cb0b0a6d62b3 · 2016-05-19T15:44:10.000+01:00
Fixed an issue with Amazon linux major release 4 installation
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -432,7 +432,7 @@
   }
 
   ## Additional graceful failures
-  if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' {
+  if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' and $::operatingsystem != 'Amazon' {
     fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 5.0 and beyond")
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`## Additional graceful failures`
`435`		`- if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' {`
	`435`	`+ if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' and $::operatingsystem != 'Amazon' {`
`436`	`436`	`fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 5.0 and beyond")`
`437`	`437`	`}`
`438`	`438`	`}`