From 5666beb4419a4714e34e540447877dba50e5f31d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 19 Nov 2020 23:49:14 +0900
Subject: [PATCH] Enable Ceph in CentOS8 scenario001/004 job

This patch enables ceph in CentOS8 scenario001 and 004, which was
disabled previously[1], since now ceph is available for CentOS8.

[1] b44d0bdd5a19661130b6ada02f9ae825783a78a1

Change-Id: I61e4eb899933e2c5b5c9d43d00240f62a3c18b94
---
 fixtures/scenario001.pp | 21 +++++----------------
 fixtures/scenario004.pp | 21 +++++----------------
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index de6ad6f8b..9a9f639b0 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -22,15 +22,6 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
   $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 {
   'Debian': {
     $ipv6                    = false
@@ -75,18 +66,18 @@ class { 'openstack_integration::keystone':
   token_expiration => '2400',
 }
 class { 'openstack_integration::glance':
-  backend => $backend,
+  backend => 'rbd',
 }
 class { 'openstack_integration::neutron':
   notification_topics => $notification_topics,
 }
 include openstack_integration::placement
 class { 'openstack_integration::nova':
-  libvirt_rbd         => $ceph,
+  libvirt_rbd         => true,
   notification_topics => $notification_topics,
 }
 class { 'openstack_integration::cinder':
-  backend => $backend,
+  backend => 'rbd',
 }
 include openstack_integration::ceilometer
 class { 'openstack_integration::aodh':
@@ -95,16 +86,14 @@ class { 'openstack_integration::aodh':
 if $enable_vitrage {
   include openstack_integration::vitrage
 }
-if $ceph {
-  include openstack_integration::ceph
-}
+include openstack_integration::ceph
 class { 'openstack_integration::heat':
   notification_topics => $notification_topics,
 }
 include openstack_integration::provision
 include openstack_integration::redis
 class { 'openstack_integration::gnocchi':
-  integration_enable => $ceph,
+  integration_enable => true,
 }
 include openstack_integration::panko
 
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index f0d10a947..374e6b0f3 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -22,15 +22,6 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
   $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' {
   $ipv6                = false
   # Watcher packages are not available in Ubuntu repository.
@@ -64,7 +55,7 @@ include openstack_integration::rabbitmq
 include openstack_integration::mysql
 include openstack_integration::keystone
 class { 'openstack_integration::glance':
-  backend => $backend,
+  backend => 'swift',
 }
 class { 'openstack_integration::neutron':
   bgpvpn_enabled      => $bgpvpn_enabled,
@@ -73,14 +64,12 @@ class { 'openstack_integration::neutron':
 }
 include openstack_integration::placement
 class { 'openstack_integration::nova':
-  libvirt_rbd => $ceph,
+  libvirt_rbd => true,
 }
 
-if $ceph {
-  class { 'openstack_integration::ceph':
-    deploy_rgw   => true,
-    swift_dropin => true,
-  }
+class { 'openstack_integration::ceph':
+  deploy_rgw   => true,
+  swift_dropin => true,
 }
 if $watcher_enabled {
   include openstack_integration::watcher