diff --git a/spec/acceptance/vitrage_wsgi_apache_spec.rb b/spec/acceptance/vitrage_wsgi_apache_spec.rb index fc53692..4157c3d 100644 --- a/spec/acceptance/vitrage_wsgi_apache_spec.rb +++ b/spec/acceptance/vitrage_wsgi_apache_spec.rb @@ -12,53 +12,12 @@ describe 'basic vitrage' do include ::openstack_integration::mysql include ::openstack_integration::keystone - rabbitmq_user { 'vitrage': - admin => true, - password => 'an_even_bigger_secret', - provider => 'rabbitmqctl', - require => Class['rabbitmq'], - } - - rabbitmq_user_permissions { 'vitrage@/': - configure_permission => '.*', - write_permission => '.*', - read_permission => '.*', - provider => 'rabbitmqctl', - require => Class['rabbitmq'], - } - case $::osfamily { 'Debian': { warning('Vitrage is not yet packaged on Ubuntu systems.') } 'RedHat': { - - class { '::vitrage': - debug => true, - default_transport_url => 'rabbit://vitrage:an_even_bigger_secret@127.0.0.1:5672', - } - class { '::vitrage::keystone::auth': - password => 'a_big_secret', - } - class { '::vitrage::keystone::authtoken': - password => 'a_big_secret', - } - class { '::vitrage::api': - enabled => true, - service_name => 'httpd', - } - include ::apache - class { '::vitrage::wsgi::apache': - ssl => false, - } - class { '::vitrage::auth': - auth_url => 'http://127.0.0.1:5000/v3', - auth_password => 'a_big_secret', - } - class { '::vitrage::client': } - class { '::vitrage::notifier': } - class { '::vitrage::graph': } - class { '::vitrage::collector': } + include ::openstack_integration::vitrage } default: { fail("Unsupported osfamily (${::osfamily})")