diff --git a/Rakefile b/Rakefile
index c8083099..6f883b30 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,7 +8,7 @@ PuppetLint.configuration.send('disable_class_parameter_defaults')
 # For stonith-enabled (it's a string not a bool)
 PuppetLint.configuration.send('disable_quoted_booleans')
 # 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 => [:spec_prep, :spec_standalone, :lint]
diff --git a/examples/params.pp b/examples/params.pp
index ce5bd006..c8bbf0e8 100644
--- a/examples/params.pp
+++ b/examples/params.pp
@@ -84,7 +84,7 @@ class os_params {
     "${galera_master_name}" => $mgmt_internal_ips[0],
     "${mgmt_names[1]}"      => $mgmt_internal_ips[1],
     "${mgmt_names[2]}"      => $mgmt_internal_ips[2],
-   }
+  }
 
   $ceph_version       = 'cuttlefish'
 
diff --git a/manifests/identity.pp b/manifests/identity.pp
index 7061e4b7..7a011046 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -456,8 +456,6 @@ class cloud::identity (
     region           => $region,
   }
 
-  keystone_config { 'ssl/enable': ensure => absent }
-
   # TODO(EmilienM) Disable WSGI - bug #98
   #include 'apache'
   # class {'keystone::wsgi::apache':
diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb
index f2887bbe..bc10ef20 100644
--- a/spec/classes/cloud_compute_hypervisor_spec.rb
+++ b/spec/classes/cloud_compute_hypervisor_spec.rb
@@ -261,7 +261,9 @@ describe 'cloud::compute::hypervisor' do
 
   context 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      { :osfamily       => 'Debian',
+        :concat_basedir => '/var/lib/puppet/concat'
+      }
     end
 
     it_configures 'openstack compute hypervisor'
@@ -269,7 +271,9 @@ describe 'cloud::compute::hypervisor' do
 
   context 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      { :osfamily => 'RedHat',
+        :concat_basedir => '/var/lib/puppet/concat'
+      }
     end
 
     it_configures 'openstack compute hypervisor'