diff --git a/resources/cinder_puppet/actions/remove.pp b/resources/cinder_puppet/actions/remove.pp
index 7d990fec..21f5561d 100644
--- a/resources/cinder_puppet/actions/remove.pp
+++ b/resources/cinder_puppet/actions/remove.pp
@@ -1,4 +1,4 @@
 class {'cinder':
-  enabled            => false,
-  package_ensure     => 'absent'
+  package_ensure     => 'absent',
+  rabbit_password    => 'not important as removed',
 }
diff --git a/resources/cinder_puppet/actions/run.pp b/resources/cinder_puppet/actions/run.pp
index 851e3945..1be5df47 100644
--- a/resources/cinder_puppet/actions/run.pp
+++ b/resources/cinder_puppet/actions/run.pp
@@ -1,4 +1,4 @@
-$resource = hiera('{{ resource_name }}')
+$resource = hiera($::resource_name)
 
 $ip = $resource['input']['ip']['value']