Switch all services to test with SSL

This patch enables SSL tests across all operating systems to
try and get CI environments matching and test features properly
across operating systems.

Change-Id: Ic1ed87d8c688a7b16a8b8ff286a83dfc8e15fb4d
This commit is contained in:
Mohammed Naser 2017-09-13 12:11:38 -04:00
parent 6832d75a96
commit ced02240b7
No known key found for this signature in database
GPG Key ID: 481CBC90384AEC42
6 changed files with 4 additions and 26 deletions

View File

@ -40,7 +40,7 @@ scenario](#all-in-one).
| - | scenario001 | scenario002 | scenario003 | scenario004 | scenario-aio |
|:----------:|:-----------:|:-----------:|:-----------:|:-----------:|:------------:|
| ssl | yes | yes | yes | yes | no |
| ssl | yes | yes | yes | yes | yes |
| ipv6 | centos7 | centos7 | centos7 | centos7 | no |
| keystone | X | X | X | X | X |
| tokens | uuid | uuid | fernet | fernet | uuid |

View File

@ -36,17 +36,8 @@ case $::osfamily {
}
}
# List of workarounds for Ubuntu Xenial:
# - disable SSL
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
$ssl_enabled = false
} else {
$ssl_enabled = true
}
include ::openstack_integration
class { '::openstack_integration::config':
ssl => $ssl_enabled,
ipv6 => $ipv6,
rpc_backend => $om_rpc,
notify_backend => $om_notify,

View File

@ -29,16 +29,9 @@ case $::osfamily {
}
}
# Disable SSL (workaround for Xenial)
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
$ssl_enabled = false
} else {
$ssl_enabled = true
}
include ::openstack_integration
class { '::openstack_integration::config':
ssl => $ssl_enabled,
ssl => true,
ipv6 => $ipv6,
}
include ::openstack_integration::cacert

View File

@ -41,19 +41,16 @@ case $::osfamily {
# List of workarounds for Ubuntu Xenial:
# - disable SSL
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
$ssl_enabled = false
# Disable Designate MDS on Ubuntu until we find why Puppet run is not
# idempotent sometimes.
$designate_enabled = false
} else {
$ssl_enabled = true
$designate_enabled = true
}
include ::openstack_integration
class { '::openstack_integration::config':
ipv6 => $ipv6,
ssl => $ssl_enabled,
}
include ::openstack_integration::cacert
include ::openstack_integration::memcached

View File

@ -16,14 +16,12 @@
# Disable SSL (workaround for Xenial)
if $::operatingsystem == 'Ubuntu' {
$ssl_enabled = false
$ipv6 = false
# Watcher packages are not available in Ubuntu repository.
$watcher_enabled = false
# TODO(rnoriega) Enable testing for BGPVPN when UCA releases pike-m1
$bgpvpn_enabled = false
} else {
$ssl_enabled = true
$ipv6 = true
$watcher_enabled = true
$bgpvpn_enabled = true
@ -31,7 +29,6 @@ if $::operatingsystem == 'Ubuntu' {
include ::openstack_integration
class { '::openstack_integration::config':
ssl => $ssl_enabled,
ipv6 => $ipv6,
}

View File

@ -2,7 +2,7 @@
#
# [*ssl*]
# (optional) Boolean to enable or not SSL.
# Defaults to false.
# Defaults to true.
#
# [*ipv6*]
# (optional) Boolean to enable or not IPv6.
@ -18,7 +18,7 @@
# Defaults to 'rabbit'.
#
class openstack_integration::config (
$ssl = false,
$ssl = true,
$ipv6 = false,
$rpc_backend = 'rabbit',
$notify_backend = 'rabbit',