| commit | 7cf1549b40aebb85dbf8fb71625737fbc36fcded | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Mon Aug 08 12:23:18 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Mon Aug 08 12:23:19 2016 +0000 |
| tree | 4caba0de037392a952fa9384725afe8f48b9405c | |
| parent | bc3871e6c9a74cf44d35c4f1b473a167f962fd53 [diff] | |
| parent | 8c787fcac85281c06e6d3452477ac24259e76d8a [diff] |
Merge "New parameter with default value cinder for ceph storage in secret.xml"
diff --git a/nova/files/secret.xml b/nova/files/secret.xml index 9816590..19e55c8 100644 --- a/nova/files/secret.xml +++ b/nova/files/secret.xml
@@ -2,6 +2,6 @@ <secret ephemeral='no' private='no'> <uuid>{{ compute.ceph.secret_uuid }}</uuid> <usage type='ceph'> - <name>client.cinder secret</name> + <name>client.{{ compute.ceph.get('rbd_user', 'cinder') }} secret</name> </usage> </secret>