Make working first unit test

- Add fixtures with some modules
- Fix dashboard manifest
- Fix dashboard unit test
- Update site.pp

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2013-12-28 14:35:18 +01:00
parent 0ad5de7675
commit 80ffa34844
6 changed files with 55 additions and 8 deletions

33
.fixtures.yml Normal file
View File

@ -0,0 +1,33 @@
fixtures:
repositories:
'cinder': 'git://github.com/stackforge/puppet-cinder'
'keystone': 'git://github.com/stackforge/puppet-keystone.git'
'nova': 'git://github.com/stackforge/puppet-nova.git'
'glance': 'git://github.com/stackforge/puppet-glance.git'
'horizon': 'git://github.com/stackforge/puppet-horizon'
'swift' : 'git://github.com/stackforge/puppet-swift'
'neutron': 'git://github.com/stackforge/puppet-neutron'
'ceilometer' : 'git://github.com/stackforge/puppet-ceilometer'
'heat' : 'git://github.com/stackforge/puppet-heat'
'apt': 'git://github.com/puppetlabs/puppetlabs-apt.git'
'apache':
repo: 'git://github.com/puppetlabs/puppetlabs-apache.git'
ref: 'origin/0.x'
'concat': 'git://github.com/puppetlabs/puppetlabs-concat.git'
'haproxy': 'git://github.com/puppetlabs/puppetlabs-haproxy.git'
'firewall': 'git://github.com/puppetlabs/puppetlabs-firewall.git'
'mysql':
repo: 'git://github.com/puppetlabs/puppetlabs-mysql.git'
ref: 'origin/0.x'
'rabbitmq':
repo: 'git://github.com/puppetlabs/puppetlabs-rabbitmq'
ref: 'origin/2.x'
'memcached': 'git://github.com/saz/puppet-memcached'
'sysctl': 'git://github.com/duritong/puppet-sysctl.git'
'inifile': 'git://github.com/puppetlabs/puppetlabs-inifile'
'vswitch': 'git://github.com/stackforge/puppet-vswitch'
'tempest': 'git://github.com/stackforge/puppet-tempest'
'vcsrepo': 'git://github.com/puppetlabs/puppetlabs-vcsrepo'
'stdlib': 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
symlinks:
'privatecloud': '#{source_dir}'

View File

@ -1,8 +1,18 @@
#require 'puppetlabs_spec_helper/rake_tasks'
#require 'puppet-lint/tasks/puppet-lint'
#
#PuppetLint.configuration.fail_on_warnings = true
#PuppetLint.configuration.send('disable_80chars')
#PuppetLint.configuration.send('disable_class_parameter_defaults')
#PuppetLint.configuration.send('disable_class_inherits_from_params_class')
#PuppetLint.configuration.send('disable_autoloader_layout')
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_class_parameter_defaults')
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
PuppetLint.configuration.send('disable_autoloader_layout')
task(:default).clear
task :default => [:spec, :lint]

View File

@ -42,7 +42,7 @@
# Defaults false
#
class dashboard::os_dashboard(
class privatecloud::dashboard::os_dashboard(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$secret_key = $os_params::secret_key,
$horizon_port = $os_params::horizon_port,

View File

@ -66,7 +66,7 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe
class {'os_sql_node':}
## Dashboard:
class {'dashboard::os_dashboard':}
class {'privatecloud::dashboard::os_dashboard':}
## Telemetry
class {'os_telemetry_common':}

View File

@ -18,7 +18,7 @@
require 'spec_helper'
describe 'dashboard::os_dashboard' do
describe 'privatecloud::dashboard::os_dashboard' do
let :default_params do
{ :listen_ssl => false }
@ -35,14 +35,16 @@ describe 'dashboard::os_dashboard' do
it 'configure horizon' do
should contain_class('horizon').with(
:listen_ssl => 'False'
:listen_ssl => false
)
end
end
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
{ :osfamily => 'Debian',
:operatingsystemrelease => '12.04',
:concat_basedir => '/var/lib/puppet/concat' }
end
it_configures 'openstack dashboard'
@ -50,7 +52,9 @@ describe 'dashboard::os_dashboard' do
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
{ :osfamily => 'RedHat',
:operatingsystemrelease => '6',
:concat_basedir => '/var/lib/puppet/concat' }
end
it_configures 'openstack dashboard'

View File