diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index 53b9bcfb4c..4d87e54704 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -54,7 +54,7 @@ parameters:
       Whether to create cron job for purging soft deleted rows in Cinder database.
     type: boolean
   CinderPassword:
-    description: The password for the cinder service account, used by cinder-api.
+    description: The password for the cinder service and db account.
     type: string
     hidden: true
   KeystoneRegion:
diff --git a/deployment/cinder/cinder-base.yaml b/deployment/cinder/cinder-base.yaml
index 480d0f1a27..3860b35171 100644
--- a/deployment/cinder/cinder-base.yaml
+++ b/deployment/cinder/cinder-base.yaml
@@ -9,7 +9,7 @@ parameters:
     description: The Cinder service's storage availability zone.
     type: string
   CinderPassword:
-    description: The password for the cinder service account, used by cinder-api.
+    description: The password for the cinder service and db account.
     type: string
     hidden: true
   Debug:
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index bd112aeb13..d1a113c7d3 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -271,6 +271,14 @@ parameters:
     type: boolean
     tags:
       - role_specific
+  CinderPassword:
+    description: The password for the cinder service and db account.
+    type: string
+    hidden: true
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
 
 resources:
 
@@ -414,6 +422,12 @@ outputs:
                 - {get_param: CephClientUserName}
             tripleo::profile::base::nova::compute::cinder_nfs_backend: {get_param: CinderEnableNfsBackend}
             rbd_persistent_storage: {get_param: CinderEnableRbdBackend}
+            nova::cinder::username: 'cinder'
+            nova::cinder::auth_type: 'v3password'
+            nova::cinder::project_name: 'service'
+            nova::cinder::password: {get_param: CinderPassword}
+            nova::cinder::auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
+            nova::cinder::region_name: {get_param: KeystoneRegion}
             nova::compute::rbd::libvirt_rbd_secret_key: {get_param: CephClientKey}
             nova::compute::rbd::libvirt_rbd_secret_uuid: {get_param: CephClusterFSID}
             nova::compute::instance_usage_audit: true