diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index c60a138f0..68e653e66 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -32,6 +32,11 @@ 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, @@ -54,13 +59,13 @@ class { 'openstack_integration::glance': backend => 'rbd', } class { 'openstack_integration::neutron': - notification_topics => ['notifications', 'vitrage_notifications'], + notification_topics => $notification_topics, metering_enabled => true, } include openstack_integration::placement class { 'openstack_integration::nova': libvirt_rbd => true, - notification_topics => ['notifications', 'vitrage_notifications'], + notification_topics => $notification_topics, cinder_enabled => true, } class { 'openstack_integration::cinder': @@ -69,14 +74,16 @@ class { 'openstack_integration::cinder': } include openstack_integration::ceilometer class { 'openstack_integration::aodh': - notification_topics => ['notifications', 'vitrage_notifications'], + notification_topics => $notification_topics, } -include openstack_integration::vitrage +# TODO(tkajinam): Disabled due to +# https://storyboard.openstack.org/#!/story/2011061 +# include openstack_integration::vitrage class { 'openstack_integration::ceph': ceph_pools => ['glance', 'nova', 'cinder', 'gnocchi', 'backups'] } class { 'openstack_integration::heat': - notification_topics => ['notifications', 'vitrage_notifications'], + notification_topics => $notification_topics, } class { 'openstack_integration::provision': # NOTE(tkajinam): Use raw format to use rbd image cloning when creating @@ -94,6 +101,8 @@ class { 'openstack_integration::tempest': ceilometer => true, aodh => true, heat => true, - vitrage => true, + # TODO(tkajinam): Disabled due to + # https://storyboard.openstack.org/#!/story/2011061 + # vitrage => true, image_format => 'raw', }