X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_compute.pp;h=00bab7f653d15e6c93e97738fcc03635006cbf82;hb=5033fd06894c3ac9ff99a82cb74020868da42306;hp=d02725ab5ccaf1fe318a3c0247175d744437b222;hpb=d7237747abe853c85643024624664f987e08c165;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index d02725ab..00bab7f6 100644
--- 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
 }
@@ -52,12 +54,10 @@ nova_config {
 $nova_enable_rbd_backend = hiera('nova_enable_rbd_backend', false)
 if $nova_enable_rbd_backend {
   include ::ceph::profile::client
-  include ::nova::compute::rbd
-  ceph::key { 'client.openstack' :
-    secret  => hiera('ceph::profile::params::mon_key'),
-    cap_mon => hiera('ceph_openstack_default_cap_mon'),
-    cap_osd => hiera('ceph_openstack_default_cap_osd'),
-    user    => 'nova',
+
+  $client_keys = hiera('ceph::profile::params::client_keys')
+  class { '::nova::compute::rbd':
+    libvirt_rbd_secret_key => $client_keys['client.openstack']['secret'],
   }
 }
 
@@ -68,7 +68,6 @@ include ::neutron
 class { 'neutron::plugins::ml2':
   flat_networks        => split(hiera('neutron_flat_networks'), ','),
   tenant_network_types => [hiera('neutron_tenant_network_type')],
-  type_drivers         => [hiera('neutron_tenant_network_type')],
 }
 
 class { 'neutron::agents::ml2::ovs':