From 24b91e75d469836f6ed5bb7c7f9fbd8395742893 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 21 Mar 2018 09:34:34 +0800 Subject: [PATCH] Switch acceptance test to use integration classes Change-Id: I79e4be4ff0a3eca635979c9b2ac9c0a2b33c9954 Depends-On: I3680dbad11435ac82ad03d0195d8e348d21b1433 --- spec/acceptance/basic_gnocchi_spec.rb | 35 ++------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/spec/acceptance/basic_gnocchi_spec.rb b/spec/acceptance/basic_gnocchi_spec.rb index e4e7bddb..688305ce 100644 --- a/spec/acceptance/basic_gnocchi_spec.rb +++ b/spec/acceptance/basic_gnocchi_spec.rb @@ -10,40 +10,9 @@ describe 'basic gnocchi' do include ::openstack_integration::repos include ::openstack_integration::mysql include ::openstack_integration::keystone - - class { '::gnocchi::db::mysql': - password => 'a_big_secret', + class { '::openstack_integration::gnocchi': + integration_enable => false, } - class { '::gnocchi::keystone::auth': - password => 'a_big_secret', - } - class { '::gnocchi': - debug => true, - database_connection => 'mysql+pymysql://gnocchi:a_big_secret@127.0.0.1/gnocchi?charset=utf8', - } - class { '::gnocchi::keystone::authtoken': - password => 'a_big_secret', - } - class { '::gnocchi::api': - enabled => true, - service_name => 'httpd', - sync_db => true, - } - class { '::gnocchi::metricd': } - class { '::gnocchi::storage': } - class { '::gnocchi::storage::file': } - include ::apache - class { '::gnocchi::wsgi::apache': - ssl => false, - } - class { '::gnocchi::statsd': - archive_policy_name => 'high', - flush_delay => '100', - resource_id => '07f26121-5777-48ba-8a0b-d70468133dd9', - user_id => 'f81e9b1f-9505-4298-bc33-43dfbd9a973b', - project_id => '203ef419-e73f-4b8a-a73f-3d599a72b18d', - } - class { '::gnocchi::client': } EOS # Run it twice and test for idempotency