diff --git a/deployment/puppet/openstack/manifests/repo/yum.pp b/deployment/puppet/openstack/manifests/repo/yum.pp
index 4099ce826f..1b2df9b28e 100644
--- a/deployment/puppet/openstack/manifests/repo/yum.pp
+++ b/deployment/puppet/openstack/manifests/repo/yum.pp
@@ -7,8 +7,6 @@ class openstack::repo::yum (
   $gpgcheck = 1,
   $mirrorlist = absent,
   $rhel_location = undef,
-  $mirrorlist = absent,
-  $rhel_location = undef,
 )
   {
 
diff --git a/deployment/puppet/selinux/manifests/config.pp b/deployment/puppet/selinux/manifests/config.pp
index f1236f9032..7c919d4f61 100644
--- a/deployment/puppet/selinux/manifests/config.pp
+++ b/deployment/puppet/selinux/manifests/config.pp
@@ -38,10 +38,18 @@ class selinux::config(
         $sestatus = '0'
 
         # workaround bugfix (http://projects.puppetlabs.com/issues/4466)
+        case $::osfamily {
+          'RedHat': {
         $facter_selinux_path = '/usr/lib/ruby/site_ruby/1.8/facter/selinux.rb'
+            }
+	         'Debian': {
+	            $facter_selinux_path = '/usr/lib/ruby/vendor_ruby/facter/selinux.rb'
+	          }
+	      }
+
         exec { "patch-facter-selinux":
-          command => "sed -i 's|proc/self/attr/current\") !|proc/self/attr/current\") rescue \"kernel\\\0\" !|' ${facter_selinux_path}",
-          unless  => "grep -q 'rescue \"kernel\\\0' ${facter_selinux_path}",
+          command => "sed -i 's|proc/self/attr/current\") !|proc/self/attr/current\") rescue \"kernel\\\\0\" !|' ${facter_selinux_path}",
+          unless  => "grep -q 'rescue \"kernel' ${facter_selinux_path}",
         }
 
         if $mode == 'disabled' and $::selinux_current_mode == 'permissive' {
diff --git a/deployment/puppet/swift/examples/all.pp b/deployment/puppet/swift/examples/all.pp
index d86085f1ca..a005600435 100644
--- a/deployment/puppet/swift/examples/all.pp
+++ b/deployment/puppet/swift/examples/all.pp
@@ -38,7 +38,6 @@ swift::storage::loopback { '2':
 
 swift::storage::node { '2':
   mnt_base_dir         => '/srv/node',
-  weight               => 1,
   manage_ring          => true,
   zone                 => '2',
   storage_local_net_ip => $swift_local_net_ip,
diff --git a/deployment/puppet/swift/examples/site.pp b/deployment/puppet/swift/examples/site.pp
index 3f324f7ee1..312b11e130 100644
--- a/deployment/puppet/swift/examples/site.pp
+++ b/deployment/puppet/swift/examples/site.pp
@@ -97,8 +97,8 @@ node keystone {
     # we are binding keystone on all interfaces
     # the end user may want to be more restrictive
     bind_host    => '0.0.0.0',
-    log_verbose  => $verbose,
-    log_debug    => $verbose,
+    verbose  => $verbose,
+    debug    => $verbose,
     catalog_type => 'sql',
   }