openstack/puppet-openstack-integration
Code Issues Proposed changes

Disable SSL for Ubuntu

Browse Source 
Ubuntu with python3 has problems with SSL.

I think this is specifically glance causing py3 + ssl
issues that we've seen before.

Setting these to false to see if we can get Ubuntu passing
then fix SSL with python3 with some help from others afterwards.

Depends-On: https://review.openstack.org/#/c/635469/
Change-Id: I4d53fc7c890943efe0be3a7707e7af5576a143e7
This commit is contained in:
Tobias Urdin 2019-02-07 12:31:45 +01:00
parent fd4f42a1d4
commit 4d9ed356e7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fixtures/scenario001.pp
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) { ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
# FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3 # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3
$ssl = false $ssl = false

2
fixtures/scenario002.pp
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) { ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
# FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3 # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3
$ssl = false $ssl = false

2
fixtures/scenario003.pp
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) { ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
# FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3 # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3
$ssl = false $ssl = false

2
fixtures/scenario004.pp
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) { ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
# FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3 # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3
$ssl = false $ssl = false