From 8d5b8d5436f98207e88bc3f4df73acf87d8e23d4 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 15 Mar 2018 11:21:10 +0800 Subject: [PATCH] Switch acceptance test to use integration classes Change-Id: Ieb55576ddf9df600708f4564cebd0bfd3931925a Depends-On: I0466a8d32513ec8240bb2b1f0d5094e11b4b0f35 --- spec/acceptance/basic_mistral_spec.rb | 51 +-------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/spec/acceptance/basic_mistral_spec.rb b/spec/acceptance/basic_mistral_spec.rb index 1028957..9e6b2c4 100644 --- a/spec/acceptance/basic_mistral_spec.rb +++ b/spec/acceptance/basic_mistral_spec.rb @@ -11,56 +11,7 @@ describe 'basic mistral' do include ::openstack_integration::rabbitmq include ::openstack_integration::mysql include ::openstack_integration::keystone - - rabbitmq_user { 'mistral': - admin => true, - password => 'an_even_bigger_secret', - provider => 'rabbitmqctl', - require => Class['rabbitmq'], - } - - rabbitmq_user_permissions { 'mistral@/': - configure_permission => '.*', - write_permission => '.*', - read_permission => '.*', - provider => 'rabbitmqctl', - require => Class['rabbitmq'], - } - - # Mistral resources - case $::osfamily { - 'Debian': { - warning('Mistral is not yet packaged on Ubuntu systems.') - } - 'RedHat': { - class { '::mistral': - database_connection => 'mysql+pymysql://mistral:a_big_secret@127.0.0.1/mistral?charset=utf8', - keystone_password => 'a_big_secret', - default_transport_url => 'rabbit://mistral:an_even_bigger_secret@127.0.0.1:5672', - debug => true, - } - class { '::mistral::keystone::auth': - password => 'a_big_secret', - } - class { '::mistral::db::mysql': - password => 'a_big_secret', - } - class { '::mistral::api': - service_name => 'httpd', - } - include ::apache - class { '::mistral::wsgi::apache': - ssl => false, - } - class { '::mistral::client': } - class { '::mistral::engine': } - class { '::mistral::executor': } - class { '::mistral::event_engine': } - } - default: { - fail("Unsupported osfamily (${::osfamily})") - } - } + include ::openstack_integration::mistral EOS