diff --git a/resources/cinder_api_puppet/actions/remove.pp b/resources/cinder_api_puppet/actions/remove.pp
index 35303039..f533cb1a 100644
--- a/resources/cinder_api_puppet/actions/remove.pp
+++ b/resources/cinder_api_puppet/actions/remove.pp
@@ -1,6 +1,7 @@
 class {'cinder::api':
   enabled            => false,
-  package_ensure     => 'absent'
+  package_ensure     => 'absent',
+  keystone_password  => 'not important as removed',
 }
 
 include cinder::params
diff --git a/resources/cinder_api_puppet/actions/run.pp b/resources/cinder_api_puppet/actions/run.pp
index 0226e15c..a5e2eb1a 100644
--- a/resources/cinder_api_puppet/actions/run.pp
+++ b/resources/cinder_api_puppet/actions/run.pp
@@ -1,4 +1,4 @@
-$resource = hiera('{{ resource_name }}')
+$resource = hiera($::resource_name)
 
 $ip = $resource['input']['ip']['value']