diff options
Diffstat (limited to 'manifests/profile/base/nova/compute/libvirt.pp')
| -rw-r--r-- | manifests/profile/base/nova/compute/libvirt.pp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp index 74af7fc..956f8ad 100644 --- a/manifests/profile/base/nova/compute/libvirt.pp +++ b/manifests/profile/base/nova/compute/libvirt.pp @@ -26,7 +26,6 @@ class tripleo::profile::base::nova::compute::libvirt ( $step = hiera('step'), ) { - if $step >= 4 { include ::tripleo::profile::base::nova::compute @@ -35,7 +34,7 @@ class tripleo::profile::base::nova::compute::libvirt ( $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('tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name')]) + $client_user = join(['client.', hiera('nova::compute::rbd::libvirt_rbd_user')]) class { '::nova::compute::rbd': libvirt_rbd_secret_key => $client_keys[$client_user]['secret'], } |