openstack/puppet-ceilometer
Code Issues Proposed changes

Acceptance: use common bits from puppet-openstack-integration

Browse Source 
Change-Id: I6eb1198d7a375c1168f02c6257055c1db070dc12
This commit is contained in:
Emilien Macchi 2015-11-18 17:47:31 +01:00
parent 5fbf51147b
commit 683260ce02
2 changed files with 9 additions and 92 deletions

40
spec/acceptance/ceilometer_with_mysql_spec.rb

@ -6,8 +6,6 @@ describe 'ceilometer with mysql' do
it 'should work with no errors' do
pp= <<-EOS
Exec { logoutput => 'on_failure' }
# make sure apache is stopped before ceilometer-api eventlet
# in case of wsgi was run before
class { '::apache':
@ -15,39 +13,10 @@ describe 'ceilometer with mysql' do
}
Service['httpd'] -> Service['keystone']
# Common resources
case $::osfamily {
'Debian': {
include ::apt
class { '::openstack_extras::repo::debian::ubuntu':
release => 'liberty',
package_require => true,
}
$package_provider = 'apt'
}
'RedHat': {
class { '::openstack_extras::repo::redhat::redhat':
release => 'liberty',
}
package { 'openstack-selinux': ensure => 'latest' }
$package_provider = 'yum'
}
default: {
fail("Unsupported osfamily (${::osfamily})")
}
}
class { '::mysql::server': }
class { '::rabbitmq':
delete_guest_user => true,
package_provider => $package_provider,
}
rabbitmq_vhost { '/':
provider => 'rabbitmqctl',
require => Class['rabbitmq'],
}
include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql
rabbitmq_user { 'ceilometer':
admin => true,
@ -64,7 +33,6 @@ describe 'ceilometer with mysql' do
require => Class['rabbitmq'],
}
# Keystone resources, needed by Ceilometer to run
class { '::keystone::db::mysql':
password => 'keystone',

61
spec/acceptance/ceilometer_wsgi_apache_spec.rb

@ -6,41 +6,11 @@ describe 'ceilometer with mysql' do
it 'should work with no errors' do
pp= <<-EOS
Exec { logoutput => 'on_failure' }
# Common resources
case $::osfamily {
'Debian': {
include ::apt
class { '::openstack_extras::repo::debian::ubuntu':
release => 'liberty',
package_require => true,
}
$package_provider = 'apt'
}
'RedHat': {
class { '::openstack_extras::repo::redhat::redhat':
release => 'liberty',
}
package { 'openstack-selinux': ensure => 'latest' }
$package_provider = 'yum'
}
default: {
fail("Unsupported osfamily (${::osfamily})")
}
}
class { '::mysql::server': }
class { '::rabbitmq':
delete_guest_user => true,
package_provider => $package_provider,
}
rabbitmq_vhost { '/':
provider => 'rabbitmqctl',
require => Class['rabbitmq'],
}
include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql
include ::openstack_integration::keystone
rabbitmq_user { 'ceilometer':
admin => true,
@ -57,27 +27,6 @@ describe 'ceilometer with mysql' do
require => Class['rabbitmq'],
}
# Keystone resources, needed by Ceilometer to run
class { '::keystone::db::mysql':
password => 'keystone',
}
class { '::keystone':
verbose => true,
debug => true,
database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
admin_token => 'admin_token',
enabled => true,
}
class { '::keystone::roles::admin':
email => 'test@example.tld',
password => 'a_big_secret',
}
class { '::keystone::endpoint':
public_url => "https://${::fqdn}:5000/",
admin_url => "https://${::fqdn}:35357/",
}
# Ceilometer resources
class { '::ceilometer':
metering_secret => 'secrete',