diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index 06397b86e..ab7c46674 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -36,7 +36,7 @@ if ($::os['family'] == 'Debian') or ($::os['name'] == 'Fedora') or } } -if ($::os['name'] == 'Fedora') or +if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3 $ssl = false diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp index c3189e474..331f9671f 100644 --- a/fixtures/scenario002.pp +++ b/fixtures/scenario002.pp @@ -36,7 +36,7 @@ if ($::os['family'] == 'Debian') or ($::os['name'] == 'Fedora') or } } -if ($::os['name'] == 'Fedora') or +if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3 $ssl = false diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index 8876b6565..38767e613 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -36,7 +36,7 @@ if ($::os['family'] == 'Debian') or ($::os['name'] == 'Fedora') or } } -if ($::os['name'] == 'Fedora') or +if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3 $ssl = false diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp index 48c2d32d9..8e0ac0eca 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -36,7 +36,7 @@ if ($::os['family'] == 'Debian') or ($::os['name'] == 'Fedora') or } } -if ($::os['name'] == 'Fedora') or +if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3 $ssl = false