diff --git a/README.md b/README.md index da863c74e..d79dd49e6 100644 --- a/README.md +++ b/README.md @@ -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 | diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index bd2ae3cc4..e506d49a8 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -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, diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp index fd94c9608..54ca26e8f 100644 --- a/fixtures/scenario002.pp +++ b/fixtures/scenario002.pp @@ -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 diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index b7148dace..f9535cc2e 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -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 diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp index e677b0479..98a4ca4bc 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -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, } diff --git a/manifests/config.pp b/manifests/config.pp index 561ac3e07..c41b9d052 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -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',