From f112b5699a2869739ad2c4ebc6b4cf8a9496b157 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 14 Mar 2023 00:18:46 +0900 Subject: [PATCH] Debian/Ubuntu: Enable vitrage service in acceptance tests ... because now vitrage packages are available for these operating systems. Change-Id: Id9b5b5d74ac4009e6c4c960e5473881e0b2c3aa4 --- spec/acceptance/10_basic_vitrage_spec.rb | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/spec/acceptance/10_basic_vitrage_spec.rb b/spec/acceptance/10_basic_vitrage_spec.rb index b2af4d4..e039bf6 100644 --- a/spec/acceptance/10_basic_vitrage_spec.rb +++ b/spec/acceptance/10_basic_vitrage_spec.rb @@ -14,31 +14,17 @@ describe 'basic vitrage' do include openstack_integration::memcached include openstack_integration::keystone - case $::osfamily { - 'Debian': { - warning('Vitrage is not yet packaged on Ubuntu systems.') - } - 'RedHat': { - include openstack_integration::vitrage - } - default: { - fail("Unsupported osfamily (${::osfamily})") - } - } + include openstack_integration::vitrage EOS - # Run it twice and test for idempotency apply_manifest(pp, :catch_failures => true) apply_manifest(pp, :catch_changes => true) end - if os[:family].casecmp('RedHat') == 0 - describe port(8999) do - it { is_expected.to be_listening } - end + describe port(8999) do + it { is_expected.to be_listening } end - end end