diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-23 18:50:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-23 18:50:49 +0000 |
| commit | 6800667195dd4892f0841d124259b04a0ffe8a56 (patch) | |
| tree | 7aece1e35ca0574e879663d01661a30004b33c4c /puppet | |
| parent | 8659269164dd4ada6230ec39df0da55dcaa221dd (diff) | |
| parent | 583e052df64d8c7e2d360900eda1b2df3991aacd (diff) | |
Merge "Add necessary parameters for encrypted volumes support"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/barbican-api.yaml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml index ab6b0ec7..b266674f 100644 --- a/puppet/services/barbican-api.yaml +++ b/puppet/services/barbican-api.yaml @@ -128,3 +128,17 @@ outputs: barbican::keystone::auth::password: {get_param: BarbicanPassword} barbican::keystone::auth::region: {get_param: KeystoneRegion} barbican::keystone::auth::tenant: 'service' + nova_compute: + nova::compute::keymgr_api_class: > + castellan.key_manager.barbican_key_manager.BarbicanKeyManager + nova::compute::barbican_endpoint: + get_param: [EndpointMap, BarbicanInternal, uri] + nova::compute::barbican_auth_endpoint: + get_param: [EndpointMap, KeystoneV3Internal, uri] + cinder_api: + cinder::api::keymgr_api_class: > + castellan.key_manager.barbican_key_manager.BarbicanKeyManager + cinder::api::keymgr_encryption_api_url: + get_param: [EndpointMap, BarbicanInternal, uri] + cinder::api::keymgr_encryption_auth_url: + get_param: [EndpointMap, KeystoneV3Internal, uri] |