X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_compute.pp;h=fb5a3520fe66837910163f92e9412b88f3ad47ad;hb=1a336269c8b07b5d2cbf6c15cdd3a8b302421c45;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..fb5a3520 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -13,16 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-if !str2bool(hiera('enable_package_install', 'false')) {
-  case $::osfamily {
-    'RedHat': {
-      Package { provider => 'norpm' } # provided by tripleo-puppet
-    }
-    default: {
-      warning('enable_package_install option not supported.')
-    }
-  }
-}
+include tripleo::packages
+
+create_resources(sysctl::value, hiera('sysctl_settings'), {})
 
 if count(hiera('ntp::servers')) > 0 {
   include ::ntp
@@ -42,6 +35,7 @@ exec { 'libvirt-default-net-destroy':
 }
 
 include ::nova
+include ::nova::config
 include ::nova::compute
 
 nova_config {
@@ -49,18 +43,27 @@ nova_config {
   'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
 }
 
-$nova_enable_rbd_backend = hiera('nova_enable_rbd_backend', false)
+$nova_enable_rbd_backend = hiera('nova::compute::rbd::ephemeral_storage', 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'],
   }
 }
 
+if hiera('cinder_enable_nfs_backend', false) {
+  if ($::selinux != "false") {
+    selboolean { 'virt_use_nfs':
+        value => on,
+        persistent => true,
+    } -> Package['nfs-utils']
+  }
+
+  package {'nfs-utils': } -> Service['nova-compute']
+}
+
 include ::nova::compute::libvirt
 include ::nova::network::neutron
 include ::neutron
@@ -68,7 +71,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':
@@ -89,3 +91,6 @@ class { 'snmp':
   agentaddress => ['udp:161','udp6:[::1]:161'],
   snmpd_config => [ join(['rouser ', hiera('snmpd_readonly_user_name')]), 'proc  cron', 'includeAllDisks  10%', 'master agentx', 'trapsink localhost public', 'iquerySecName internalUser', 'rouser internalUser', 'defaultMonitors yes', 'linkUpDownNotifications yes' ],
 }
+
+hiera_include('compute_classes')
+package_manifest{'/var/lib/tripleo/installed-packages/overcloud_compute': ensure => present}