diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index de6ad6f8b..5228374f0 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -31,6 +31,13 @@ if ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) $ceph = true } +if $::osfamily == 'RedHat' { + # (amoralej) - disable selinux defaults until + # https://tickets.puppetlabs.com/browse/PUP-7559 is fixed + Concat { selinux_ignore_defaults => true } + File { selinux_ignore_defaults => true } +} + case $::osfamily { 'Debian': { $ipv6 = false diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp index c9f33ffbb..01996542d 100644 --- a/fixtures/scenario002.pp +++ b/fixtures/scenario002.pp @@ -22,6 +22,13 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or $ssl = true } +if $::osfamily == 'RedHat' { + # (amoralej) - disable selinux defaults until + # https://tickets.puppetlabs.com/browse/PUP-7559 is fixed + Concat { selinux_ignore_defaults => true } + File { selinux_ignore_defaults => true } +} + case $::osfamily { 'Debian': { $ipv6 = false diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index deeb7b7eb..7a1b0c12b 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -22,6 +22,13 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or $ssl = true } +if $::osfamily == 'RedHat' { + # (amoralej) - disable selinux defaults until + # https://tickets.puppetlabs.com/browse/PUP-7559 is fixed + Concat { selinux_ignore_defaults => true } + File { selinux_ignore_defaults => true } +} + case $::osfamily { 'Debian': { $ipv6 = false diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp index b569f49aa..17de93243 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -31,6 +31,13 @@ if ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) $ceph = true } +if $::osfamily == 'RedHat' { + # (amoralej) - disable selinux defaults until + # https://tickets.puppetlabs.com/browse/PUP-7559 is fixed + Concat { selinux_ignore_defaults => true } + File { selinux_ignore_defaults => true } +} + if $::operatingsystem == 'Ubuntu' { $ipv6 = false # Watcher packages are not available in Ubuntu repository.