diff --git a/packstack/puppet/templates/cinder_lvm.pp b/packstack/puppet/templates/cinder_lvm.pp
index 4726383c5..653b17c18 100644
--- a/packstack/puppet/templates/cinder_lvm.pp
+++ b/packstack/puppet/templates/cinder_lvm.pp
@@ -9,12 +9,6 @@ if $create_cinder_volume == 'y' {
       loopback_device => $loop_dev,
       volume_path     => '/var/lib/cinder',
       volume_name     => 'cinder-volumes',
-    } ->
-
-    file {'/var/lib/cinder':
-      ensure  => directory,
-      mode    => "0600",
-      recurse => true,
     }
 
     # Add loop device on boot
diff --git a/packstack/puppet/templates/swift_common.pp b/packstack/puppet/templates/swift_common.pp
index 488fa17e1..792212a7d 100644
--- a/packstack/puppet/templates/swift_common.pp
+++ b/packstack/puppet/templates/swift_common.pp
@@ -3,6 +3,6 @@ Class['swift'] -> Service <| |>
 
 class { '::swift':
   # not sure how I want to deal with this shared secret
-  swift_hash_suffix => hiera('CONFIG_SWIFT_HASH'),
-  package_ensure    => latest,
+  swift_hash_path_suffix => hiera('CONFIG_SWIFT_HASH'),
+  package_ensure         => latest,
 }