diff --git a/.gitignore b/.gitignore index 988dcbbe..7c9210fe 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ .envrc /inventory.yaml /spec/fixtures/litmus_inventory.yaml +/acceptance/junit +/acceptance/log \ No newline at end of file diff --git a/manifests/osfamily/redhat.pp b/manifests/osfamily/redhat.pp index 36e6693d..74df29c7 100644 --- a/manifests/osfamily/redhat.pp +++ b/manifests/osfamily/redhat.pp @@ -18,12 +18,13 @@ $platform_and_version = "fedora/${facts['os']['release']['major']}" } 'Amazon': { - if ("${facts['os']['release']['major']}" == '2') { - $amz_el_version = '7' - } else { - $amz_el_version = '6' - } - $platform_and_version = "el/${amz_el_version}" + $major_version = $facts['os']['release']['major'] + if ($major_version == '2') + { $platform_and_version = 'el/7' } + elsif ($major_version == '2017') + { $platform_and_version = 'el/6' } + else + { $platform_and_version = "amazon/${major_version}" } } default: { $platform_and_version = "el/${facts['os']['release']['major']}"