diff options
| author | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-08-12 15:09:49 +0200 |
|---|---|---|
| committer | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-08-12 15:09:49 +0200 |
| commit | 8f4baae7d434a2c334ac1e41fc77d3cc74bbbcea (patch) | |
| tree | 42753e568d3e3cab7fd508c6bba24d1dadceae87 | |
| parent | acea19e0e44e2eb890fe60ca0de55e3fab2da0b6 (diff) | |
| parent | b7cd43093d3cda9cb8b02827b7efcbf7ada26695 (diff) | |
Merge pull request #50 from shamil/master
Add support for Amazon Linux AMI
| -rw-r--r-- | manifests/params.pp | 6 | ||||
| -rw-r--r-- | metadata.json | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index 4ca216d..3d0b0f5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -12,7 +12,11 @@ class augeas::params { case $::osfamily { 'RedHat': { - $ruby_pkg = 'ruby-augeas' + $ruby_pkg = $::operatingsystem ? { + # Amazon Linux AMI (2014.09 and 2015.03) uses ruby 2.0 + 'Amazon' => 'ruby20-augeas', + default => 'ruby-augeas' + } $augeas_pkgs = ['augeas', 'augeas-libs'] } diff --git a/metadata.json b/metadata.json index 3dc6212..9d492a7 100644 --- a/metadata.json +++ b/metadata.json @@ -46,7 +46,15 @@ "5", "6" ] + }, + { + "operatingsystem": "Amazon", + "operatingsystemrelease": [ + "2014.09", + "2015.03" + ] } + ], "puppet_version": [ "2.7", |