stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #328 from enovance/bug/326/sbadia

Browse Source 
Fix various lint and errors
This commit is contained in:
Emilien Macchi 2014-03-04 18:41:54 +01:00
commit 4c7c55f98b
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rakefile
View File

@ -8,7 +8,7 @@ PuppetLint.configuration.send('disable_class_parameter_defaults')
# For stonith-enabled (it's a string not a bool) # For stonith-enabled (it's a string not a bool)
PuppetLint.configuration.send('disable_quoted_booleans') PuppetLint.configuration.send('disable_quoted_booleans')
# Ignore all upstream modules # Ignore all upstream modules
PuppetLint.configuration.ignore_paths = ['spec/fixtures/modules/**/*.pp'] PuppetLint.configuration.ignore_paths = ['spec/fixtures/modules/**/*.pp','examples/*.pp']
task(:default).clear task(:default).clear
task :default => [:spec_prep, :spec_standalone, :lint] task :default => [:spec_prep, :spec_standalone, :lint]

2
manifests/identity.pp
View File

@ -456,8 +456,6 @@ class cloud::identity (
region => $region, region => $region,
} }
keystone_config { 'ssl/enable': ensure => absent }
# TODO(EmilienM) Disable WSGI - bug #98 # TODO(EmilienM) Disable WSGI - bug #98
#include 'apache' #include 'apache'
# class {'keystone::wsgi::apache': # class {'keystone::wsgi::apache':

8
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -261,7 +261,9 @@ describe 'cloud::compute::hypervisor' do
context 'on Debian platforms' do context 'on Debian platforms' do
let :facts do let :facts do
{ :osfamily => 'Debian' } { :osfamily => 'Debian',
:concat_basedir => '/var/lib/puppet/concat'
}
end end
it_configures 'openstack compute hypervisor' it_configures 'openstack compute hypervisor'
@ -269,7 +271,9 @@ describe 'cloud::compute::hypervisor' do
context 'on RedHat platforms' do context 'on RedHat platforms' do
let :facts do let :facts do
{ :osfamily => 'RedHat' } { :osfamily => 'RedHat',
:concat_basedir => '/var/lib/puppet/concat'
}
end end
it_configures 'openstack compute hypervisor' it_configures 'openstack compute hypervisor'