openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Update puppet-tripleo libvirt to support docker deployments"

Browse Source
This commit is contained in:
Jenkins 2017-07-05 19:43:53 +00:00 committed by Gerrit Code Review
commit e74e32338e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/profile/base/nova/compute/libvirt.pp
View File

@ -33,11 +33,7 @@ class tripleo::profile::base::nova::compute::libvirt (
$rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false)
$rbd_persistent_storage = hiera('rbd_persistent_storage', false)
if $rbd_ephemeral_storage or $rbd_persistent_storage {
$client_keys = hiera('ceph::profile::params::client_keys')
$client_user = join(['client.', hiera('nova::compute::rbd::libvirt_rbd_user')])
class { '::nova::compute::rbd':
libvirt_rbd_secret_key => $client_keys[$client_user]['secret'],
}
include ::nova::compute::rbd
}
if $rbd_ephemeral_storage {