openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Re-enable SSL en p-o-i scenarios 1, 3 and 4"

Browse Source
This commit is contained in:
Zuul 2021-03-04 16:19:36 +00:00 committed by Gerrit Code Review
commit 877873a69d
6 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fixtures/scenario001.pp
View File

@ -14,9 +14,7 @@
# limitations under the License. # limitations under the License.
# #
if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
($::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 $ssl = false
} else { } else {
$ssl = true $ssl = true

4
fixtures/scenario003.pp
View File

@ -14,9 +14,7 @@
# limitations under the License. # limitations under the License.
# #
if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
($::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 $ssl = false
} else { } else {
$ssl = true $ssl = true

4
fixtures/scenario004.pp
View File

@ -14,9 +14,7 @@
# limitations under the License. # limitations under the License.
# #
if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
($::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 $ssl = false
} else { } else {
$ssl = true $ssl = true

2
manifests/cinder.pp
View File

@ -120,7 +120,7 @@ class openstack_integration::cinder (
class { 'cinder::backup': } class { 'cinder::backup': }
class { 'cinder::cron::db_purge': } class { 'cinder::cron::db_purge': }
class { 'cinder::glance': class { 'cinder::glance':
glance_api_servers => "${::openstack_integration::config::base_url}:9292", glance_api_servers => "http://${::openstack_integration::config::ip_for_url}:9292",
} }
case $backend { case $backend {
'iscsi': { 'iscsi': {

13
manifests/glance.pp
View File

@ -14,12 +14,9 @@ class openstack_integration::glance (
if $::openstack_integration::config::ssl { if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'glance': openstack_integration::ssl_key { 'glance':
notify => Service['glance-api'],
} }
Package<| tag == 'glance-package' |> -> File['/etc/glance/ssl'] $key_file = undef
$key_file = "/etc/glance/ssl/private/${::fqdn}.pem" $crt_file = undef
$crt_file = $::openstack_integration::params::cert_path
Exec['update-ca-certificates'] ~> Service['glance-api']
} else { } else {
$key_file = undef $key_file = undef
$crt_file = undef $crt_file = undef
@ -36,9 +33,9 @@ class openstack_integration::glance (
include glance include glance
include glance::client include glance::client
class { 'glance::keystone::auth': class { 'glance::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:9292", public_url => "http://${::openstack_integration::config::ip_for_url}:9292",
internal_url => "${::openstack_integration::config::base_url}:9292", internal_url => "http://${::openstack_integration::config::ip_for_url}:9292",
admin_url => "${::openstack_integration::config::base_url}:9292", admin_url => "http://${::openstack_integration::config::ip_for_url}:9292",
password => 'a_big_secret', password => 'a_big_secret',
} }
class { 'glance::api::authtoken': class { 'glance::api::authtoken':

2
manifests/neutron.pp
View File

@ -38,7 +38,7 @@ class openstack_integration::neutron (
notify => Service['neutron-server'], notify => Service['neutron-server'],
require => Package['neutron'], require => Package['neutron'],
} }
Exec['update-ca-certificates'] ~> Service['neutron-server'] Exec['update-ca-certificates'] ~> Service<| tag == 'neutron-service' |>
} }
if ($::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '8') == 0) { if ($::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '8') == 0) {