Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "horizon/keystone api should use internal_api NW"
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_compute.pp
diff --git
a/puppet/manifests/overcloud_compute.pp
b/puppet/manifests/overcloud_compute.pp
index
5883403
..
caca89a
100644
(file)
--- a/
puppet/manifests/overcloud_compute.pp
+++ b/
puppet/manifests/overcloud_compute.pp
@@
-24,6
+24,8
@@
if !str2bool(hiera('enable_package_install', 'false')) {
}
}
}
}
+create_resources(sysctl::value, hiera('sysctl_settings'), {})
+
if count(hiera('ntp::servers')) > 0 {
include ::ntp
}
if count(hiera('ntp::servers')) > 0 {
include ::ntp
}
@@
-52,7
+54,11
@@
nova_config {
$nova_enable_rbd_backend = hiera('nova_enable_rbd_backend', false)
if $nova_enable_rbd_backend {
include ::ceph::profile::client
$nova_enable_rbd_backend = hiera('nova_enable_rbd_backend', false)
if $nova_enable_rbd_backend {
include ::ceph::profile::client
- include ::nova::compute::rbd
+
+ $client_keys = hiera('ceph::profile::params::client_keys')
+ class { '::nova::compute::rbd':
+ libvirt_rbd_secret_key => $client_keys['client.openstack']['secret'],
+ }
}
include ::nova::compute::libvirt
}
include ::nova::compute::libvirt