Merge "Disable SSL for Ubuntu"

This commit is contained in:
Zuul 2019-02-13 14:10:53 +00:00 committed by Gerrit Code Review
commit 5330ee32a9
4 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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