openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Enable Ceph in CentOS8 scenario001/004 job"

Browse Source
This commit is contained in:
Zuul 2020-12-02 03:14:07 +00:00 committed by Gerrit Code Review
commit bfbf5f0d6d
2 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fixtures/scenario001.pp
View File

@ -22,15 +22,6 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
$ssl = true $ssl = true
} }
# FIXME(ykarel) Enable ceph in CentOS8 once Ceph repos are available
if ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$backend = undef
$ceph = false
} else {
$backend = 'rbd'
$ceph = true
}
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
$ipv6 = false $ipv6 = false
@ -75,18 +66,18 @@ class { 'openstack_integration::keystone':
token_expiration => '2400', token_expiration => '2400',
} }
class { 'openstack_integration::glance': class { 'openstack_integration::glance':
backend => $backend, backend => 'rbd',
} }
class { 'openstack_integration::neutron': class { 'openstack_integration::neutron':
notification_topics => $notification_topics, notification_topics => $notification_topics,
} }
include openstack_integration::placement include openstack_integration::placement
class { 'openstack_integration::nova': class { 'openstack_integration::nova':
libvirt_rbd => $ceph, libvirt_rbd => true,
notification_topics => $notification_topics, notification_topics => $notification_topics,
} }
class { 'openstack_integration::cinder': class { 'openstack_integration::cinder':
backend => $backend, backend => 'rbd',
} }
include openstack_integration::ceilometer include openstack_integration::ceilometer
class { 'openstack_integration::aodh': class { 'openstack_integration::aodh':
@ -95,16 +86,14 @@ class { 'openstack_integration::aodh':
if $enable_vitrage { if $enable_vitrage {
include openstack_integration::vitrage include openstack_integration::vitrage
} }
if $ceph { include openstack_integration::ceph
include openstack_integration::ceph
}
class { 'openstack_integration::heat': class { 'openstack_integration::heat':
notification_topics => $notification_topics, notification_topics => $notification_topics,
} }
include openstack_integration::provision include openstack_integration::provision
include openstack_integration::redis include openstack_integration::redis
class { 'openstack_integration::gnocchi': class { 'openstack_integration::gnocchi':
integration_enable => $ceph, integration_enable => true,
} }
include openstack_integration::panko include openstack_integration::panko

21
fixtures/scenario004.pp
View File

@ -22,15 +22,6 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
$ssl = true $ssl = true
} }
# FIXME(ykarel) Enable ceph in CentOS8 once Ceph repos are available
if ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$backend = undef
$ceph = false
} else {
$backend = 'swift'
$ceph = true
}
if $::operatingsystem == 'Ubuntu' { if $::operatingsystem == 'Ubuntu' {
$ipv6 = false $ipv6 = false
# Watcher packages are not available in Ubuntu repository. # Watcher packages are not available in Ubuntu repository.
@ -64,7 +55,7 @@ include openstack_integration::rabbitmq
include openstack_integration::mysql include openstack_integration::mysql
include openstack_integration::keystone include openstack_integration::keystone
class { 'openstack_integration::glance': class { 'openstack_integration::glance':
backend => $backend, backend => 'swift',
} }
class { 'openstack_integration::neutron': class { 'openstack_integration::neutron':
bgpvpn_enabled => $bgpvpn_enabled, bgpvpn_enabled => $bgpvpn_enabled,
@ -73,14 +64,12 @@ class { 'openstack_integration::neutron':
} }
include openstack_integration::placement include openstack_integration::placement
class { 'openstack_integration::nova': class { 'openstack_integration::nova':
libvirt_rbd => $ceph, libvirt_rbd => true,
} }
if $ceph { class { 'openstack_integration::ceph':
class { 'openstack_integration::ceph': deploy_rgw => true,
deploy_rgw => true, swift_dropin => true,
swift_dropin => true,
}
} }
if $watcher_enabled { if $watcher_enabled {
include openstack_integration::watcher include openstack_integration::watcher