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 "Composable roles within services - Redis"
[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
8863f42
..
6a6f54e
100644
(file)
--- a/
puppet/manifests/overcloud_compute.pp
+++ b/
puppet/manifests/overcloud_compute.pp
@@
-70,7
+70,7
@@
if hiera('step') >= 4 {
include ::ceph::profile::client
$client_keys = hiera('ceph::profile::params::client_keys')
include ::ceph::profile::client
$client_keys = hiera('ceph::profile::params::client_keys')
- $client_user = join(['client.', hiera('
ceph_client
_user_name')])
+ $client_user = join(['client.', hiera('
tripleo::profile::base::cinder::volume::rbd::cinder_rbd
_user_name')])
class { '::nova::compute::rbd':
libvirt_rbd_secret_key => $client_keys[$client_user]['secret'],
}
class { '::nova::compute::rbd':
libvirt_rbd_secret_key => $client_keys[$client_user]['secret'],
}
@@
-108,7
+108,6
@@
if hiera('step') >= 4 {
nova_config {
'DEFAULT/my_ip': value => $ipaddress;
'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
nova_config {
'DEFAULT/my_ip': value => $ipaddress;
'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
- 'DEFAULT/host': value => $fqdn;
}
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
}
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {