From 657fa58914ecf14da1e52374f7dd4069465bd802 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 3 Sep 2024 18:37:28 +0900
Subject: [PATCH] Revert "Disable Vitrage in Scenario001"

This reverts commit 96d855444e13ede06e9f1535c371f089d44a1cc4.

Reason for revert:
The issue caused by oslo.db bump was fixed by [1].

[1] d6b5247dbb1acedd43b3dc8e7b1cac06519467c4

Change-Id: I32a2fd6ae9c4498fdfeb53d2b40f7dbcdf839158
---
 fixtures/scenario001.pp | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index c9095dad3..1509eb83b 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -34,11 +34,6 @@ case $facts['os']['family'] {
   }
 }
 
-# TODO(tkajinam): Vitrage is disabled due to
-# https://storyboard.openstack.org/#!/story/2011061
-# $notification_topics = ['notifications', 'vitrage_notifications']
-$notification_topics = ['notifications']
-
 include openstack_integration
 class { 'openstack_integration::config':
   ssl           => $ssl,
@@ -63,13 +58,13 @@ class { 'openstack_integration::glance':
   show_multiple_locations => true,
 }
 class { 'openstack_integration::neutron':
-  notification_topics => $notification_topics,
+  notification_topics => ['notifications', 'vitrage_notifications'],
   metering_enabled    => true,
 }
 include openstack_integration::placement
 class { 'openstack_integration::nova':
   libvirt_rbd         => true,
-  notification_topics => $notification_topics,
+  notification_topics => ['notifications', 'vitrage_notifications'],
   cinder_enabled      => true,
 }
 class { 'openstack_integration::cinder':
@@ -78,16 +73,14 @@ class { 'openstack_integration::cinder':
 }
 include openstack_integration::ceilometer
 class { 'openstack_integration::aodh':
-  notification_topics => $notification_topics,
+  notification_topics => ['notifications', 'vitrage_notifications'],
 }
-# TODO(tkajinam): Disabled due to
-# https://storyboard.openstack.org/#!/story/2011061
-# include openstack_integration::vitrage
+include openstack_integration::vitrage
 class { 'openstack_integration::ceph':
   ceph_pools => ['glance', 'nova', 'cinder', 'gnocchi', 'backups']
 }
 class { 'openstack_integration::heat':
-  notification_topics => $notification_topics,
+  notification_topics => ['notifications', 'vitrage_notifications'],
 }
 class { 'openstack_integration::provision':
   # NOTE(tkajinam): Use raw format to use rbd image cloning when creating
@@ -105,8 +98,6 @@ class { 'openstack_integration::tempest':
   ceilometer    => true,
   aodh          => true,
   heat          => true,
-  # TODO(tkajinam): Disabled due to
-  # https://storyboard.openstack.org/#!/story/2011061
-  # vitrage       => true,
+  vitrage       => true,
   image_format  => 'raw',
 }