Merge pull request #9160 from mhashizume/PUP-19986/7.x/amazon-test

(PUP-11986) Add Amazon Linux package mapping

Author: cthorn42

acceptance/tests/resource/service/ticket_5024_systemd_enabling_masked_service.rb

@@ -17,6 +17,7 @@
 package_name = {'el'     => 'httpd',
                 'centos' => 'httpd',
                 'fedora' => 'httpd',
+                'amazon' => 'httpd',
                 'sles'   => 'apache2',
                 'debian' => 'cron', # apache2 does not create systemd service symlinks in Debian
                 'ubuntu' => 'cron', # See https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1447807
@@ -43,13 +44,6 @@
     package { '#{package_name[platform]}':
       ensure => present,
     }
-    if ($::operatingsystem == 'Fedora') and ($::operatingsystemmajrelease == '23') {
-      package{'libnghttp2':
-        ensure => latest,
-        install_options => '--best',
-        before => Package['httpd'],
-      }
-    }
   }
   manifest_service_masked = %Q{
     service { '#{package_name[platform]}':