From: ZhongShengping <chdzsp@163.com>
Date: Tue, 20 Mar 2018 05:57:30 +0000 (+0800)
Subject: Switch acceptance test to use integration classes
X-Git-Tag: 13.0.0~9
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=29b45e8ab544282e71ff817151a8769c3bb2acfb;p=puppet-modules%2Fpuppet-ceilometer.git

Switch acceptance test to use integration classes

Change-Id: I2ce4de9d5212b112932ba9660ae5b13cbd23b0ad
Depends-On: If3a1c1299de725c23e2586453c9ab85e9db988b8
---

diff --git a/spec/acceptance/ceilometer_wsgi_apache_spec.rb b/spec/acceptance/ceilometer_wsgi_apache_spec.rb
index f224751..f158590 100644
--- a/spec/acceptance/ceilometer_wsgi_apache_spec.rb
+++ b/spec/acceptance/ceilometer_wsgi_apache_spec.rb
@@ -11,50 +11,9 @@ describe 'ceilometer with mysql' do
       include ::openstack_integration::rabbitmq
       include ::openstack_integration::mysql
       include ::openstack_integration::keystone
-
-      rabbitmq_user { 'ceilometer':
-        admin    => true,
-        password => 'an_even_bigger_secret',
-        provider => 'rabbitmqctl',
-        require  => Class['rabbitmq'],
-      }
-
-      rabbitmq_user_permissions { 'ceilometer@/':
-        configure_permission => '.*',
-        write_permission     => '.*',
-        read_permission      => '.*',
-        provider             => 'rabbitmqctl',
-        require              => Class['rabbitmq'],
-      }
-
-      # Ceilometer resources
-      class { '::ceilometer':
-        debug                 => true,
-        telemetry_secret      => 'secrete',
-        default_transport_url => 'rabbit://ceilometer:an_even_bigger_secret@127.0.0.1:5672',
-      }
-      class { '::ceilometer::keystone::auth':
-        password => 'a_big_secret',
-      }
-      class { '::ceilometer::db::mysql':
-        password => 'a_big_secret',
-      }
-      class { '::ceilometer::db':
-        database_connection => 'mysql+pymysql://ceilometer:a_big_secret@127.0.0.1/ceilometer?charset=utf8',
-	sync_db             => false,
-      }
-      # NOTE(tobasco): When running the beaker tests we need to exclude the
-      # gnocchi resource types since the acceptance test does not setup gnocchi itself.
-      class { '::ceilometer::db::sync':
-        extra_params => '--skip-gnocchi-resource-types',
-      }
-      class { '::ceilometer::expirer': }
-      class { '::ceilometer::agent::central': }
-      class { '::ceilometer::agent::notification': }
-      class { '::ceilometer::keystone::authtoken':
-        password => 'a_big_secret',
+      class { '::openstack_integration::ceilometer':
+        integration_enable => false,
       }
-      class { '::ceilometer::dispatcher::gnocchi': }
       EOS