Skip to content

Added support for Amazon linux#29

Merged
brettporter merged 2 commits intopuppetlabs:masterfrom
actionjack:master
Jul 13, 2013
Merged

Added support for Amazon linux#29
brettporter merged 2 commits intopuppetlabs:masterfrom
actionjack:master

Conversation

@actionjack
Copy link
Copy Markdown
Contributor

Added support for Amazon linux version 3 with Facter 1.7.x.

# facter | grep -i -e ^o -e ^fac
facterversion => 1.7.1
operatingsystem => Amazon
operatingsystemmajrelease => 3
operatingsystemrelease => 3.4.43-43.43.amzn1.x86_64
osfamily => RedHat

Ref: http://projects.puppetlabs.com/issues/15792

Also updated .gitignore to prevent my IDE messing up the source tree.

Cheers

-Martin

@brettporter
Copy link
Copy Markdown
Contributor

Thanks - some overlap with #17 - will take a look.

@actionjack
Copy link
Copy Markdown
Contributor Author

Hi @brettporter ,

Yeah I saw #17, but since that was submitted there was a version comparison check added with Red Hat / CentOS 6.3 that forces the version of java down to 1.6.0 since Amazon Linux reports its release as version 3.

# facter | grep -i -e ^o 
operatingsystem => Amazon
operatingsystemmajrelease => 3
operatingsystemrelease => 3.4.43-43.43.amzn1.x86_64
osfamily => RedHat

Here's an example using the updated tests with asserts dependent on java 1.7.0:

/Users/martin/.rvm/rubies/ruby-1.9.3-p385/bin/ruby -S rspec spec/classes/java_spec.rb --color

expected that the catalogue would contain Package[java] with name set to `"java-1.7.0-openjdk-devel"` but it is set to `"java-1.6.0-openjdk-devel"` in the catalogue
./spec/classes/java_spec.rb:33:in `block (3 levels) in <top (required)>'

expected that the catalogue would contain Package[java] with name set to `"java-1.7.0-openjdk"` but it is set to `"java-1.6.0-openjdk"` in the catalogue
./spec/classes/java_spec.rb:39:in `block (3 levels) in <top (required)>'

7 examples, 2 failures, 5 passed

Cheers

@actionjack

@brettporter
Copy link
Copy Markdown
Contributor

Thanks, good catch!

brettporter added a commit that referenced this pull request Jul 13, 2013
Added support for Amazon linux
@brettporter brettporter merged commit 9188f0e into puppetlabs:master Jul 13, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants