Merge "Add necessary parameters for encrypted volumes support"
authorJenkins <jenkins@review.openstack.org>
Wed, 23 Nov 2016 18:50:49 +0000 (18:50 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 23 Nov 2016 18:50:49 +0000 (18:50 +0000)

Trivial merge