From 4f0a7b1b6392ef09452ad11e7911070c47d673b4 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 21 Mar 2018 09:26:32 +0800 Subject: [PATCH] Switch acceptance test to use integration classes Change-Id: I012372ab87e34f93bf0ee801f9292d0f059a1ba2 --- spec/acceptance/basic_glance_spec.rb | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/spec/acceptance/basic_glance_spec.rb b/spec/acceptance/basic_glance_spec.rb index d061d06c..691c81ee 100644 --- a/spec/acceptance/basic_glance_spec.rb +++ b/spec/acceptance/basic_glance_spec.rb @@ -8,28 +8,7 @@ describe 'glance class' do include ::openstack_integration::repos include ::openstack_integration::mysql include ::openstack_integration::keystone - - # Glance resources - include ::glance - include ::glance::client - include ::glance::backend::file - class { '::glance::db::mysql': - # https://bugs.launchpad.net/puppet-glance/+bug/1446375 - collate => 'utf8_general_ci', - password => 'a_big_secret', - } - class { '::glance::keystone::auth': - password => 'a_big_secret', - } - class { '::glance::api::authtoken': - password => 'a_big_secret', - } - class { '::glance::api': - debug => true, - database_connection => 'mysql+pymysql://glance:a_big_secret@127.0.0.1/glance?charset=utf8', - enable_v1_api => false, - enable_v2_api => true, - } + include ::openstack_integration::glance glance_image { 'test_image': ensure => present,