From b58bb43a8967653c505ff4478dc95e594ecdcedd Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 15 Mar 2018 14:27:09 +0800 Subject: [PATCH] Switch acceptance test to use integration classes Change-Id: I35d2a14180f50c82fbe9d52d4a96f2cc04c8294c Depends-On: Iaa472948e451ef6a0f3dc43356daed97cc9da4a7 --- spec/acceptance/basic_sahara_spec.rb | 37 ++-------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/spec/acceptance/basic_sahara_spec.rb b/spec/acceptance/basic_sahara_spec.rb index 144526ba..5b26a9d1 100644 --- a/spec/acceptance/basic_sahara_spec.rb +++ b/spec/acceptance/basic_sahara_spec.rb @@ -11,42 +11,9 @@ describe 'basic sahara' do include ::openstack_integration::rabbitmq include ::openstack_integration::mysql include ::openstack_integration::keystone - - rabbitmq_user { 'sahara': - admin => true, - password => 'an_even_bigger_secret', - provider => 'rabbitmqctl', - require => Class['rabbitmq'], + class { '::openstack_integration::sahara': + integration_enable => false, } - - rabbitmq_user_permissions { 'sahara@/': - configure_permission => '.*', - write_permission => '.*', - read_permission => '.*', - provider => 'rabbitmqctl', - require => Class['rabbitmq'], - } - - # Sahara resources - class { '::sahara::db::mysql': - password => 'a_big_secret', - } - class { '::sahara': - debug => true, - default_transport_url => 'rabbit://sahara:an_even_bigger_secret@127.0.0.1:5672/', - rpc_backend => 'rabbit', - database_connection => 'mysql+pymysql://sahara:a_big_secret@127.0.0.1/sahara?charset=utf8', - } - class { '::sahara::keystone::authtoken': - password => 'a_big_secret', - } - class { '::sahara::service::api': } - class { '::sahara::service::engine': } - class { '::sahara::keystone::auth': - password => 'a_big_secret', - } - class { '::sahara::client': } - class { '::sahara::notify': } EOS