Merge pull request #865 from p7s1-wschreiner/patch-1

Update default_mods.pp
redhat-openstack · Sep 29, 2014 · 91007b1 · 91007b1
2 parents 81b9541 + ae374cc
commit 91007b1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
@@ -12,7 +12,7 @@
       if versioncmp($apache_version, '2.4') >= 0 {
         # Lets fork it
         # Do not try to load mod_systemd on RHEL/CentOS 6 SCL.
-        if !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) {
+        if ( !($::osfamily == 'redhat' and versioncmp($::operatingsystemrelease, '7.0') == -1) and !($::operatingsystem == 'Amazon' and versioncmp($::operatingsystemrelease, '2014.09') <= 0  ) ) {
           ::apache::mod { 'systemd': }
         }
         ::apache::mod { 'unixd': }