4 files changed, 70 insertions, 18 deletions

diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 4064b1e..3b36c57 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -34,10 +34,9 @@ class tripleo::profile::base::nova::api (
 
   include ::tripleo::profile::base::nova
 
-  if $step >= 2 and $sync_db {
+  if $step >= 3 and $sync_db {
     include ::nova::db::mysql
     include ::nova::db::mysql_api
-    Exec<| title == 'galera-ready'|> -> Anchor['nova::db::begin']
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp
index 579b474..16b61df 100644
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@ -23,8 +23,13 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*cinder_nfs_backend*]
+#   (Optional) Whether or not Cinder is backed by NFS.
+#   Defaults to hiera('cinder_enable_nfs_backend', false)
+#
 class tripleo::profile::base::nova::compute (
-  $step = hiera('step'),
+  $step               = hiera('step'),
+  $cinder_nfs_backend = hiera('cinder_enable_nfs_backend', false),
 ) {
 
   if $step >= 4 {
@@ -38,4 +43,17 @@ class tripleo::profile::base::nova::compute (
     include ::nova::network::neutron
   }
 
+  # If NFS is used as a Cinder backend
+  if $cinder_nfs_backend {
+    ensure_packages('nfs-utils', { ensure => present })
+    Package['nfs-utils'] -> Service['nova-compute']
+    if str2bool($::selinux) {
+      selboolean { 'virt_use_nfs':
+        value      => on,
+        persistent => true,
+      }
+      Selboolean['virt_use_nfs'] -> Package['nfs-utils']
+    }
+  }
+
 }
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index f6d6a0a..5b6f895 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -30,26 +30,12 @@ class tripleo::profile::base::nova::compute::libvirt (
   if $step >= 4 {
     include ::tripleo::profile::base::nova::compute
 
-    file { ['/etc/libvirt/qemu/networks/autostart/default.xml',
-      '/etc/libvirt/qemu/networks/default.xml']:
-      ensure => absent,
-      before => Service['libvirt'],
-    }
-
-    # in case libvirt has been already running before the Puppet run, make
-    # sure the default network is destroyed
-    exec { 'libvirt-default-net-destroy':
-      command => '/usr/bin/virsh net-destroy default',
-      onlyif  => '/usr/bin/virsh net-info default | /bin/grep -i "^active:\s*yes"',
-      before  => Service['libvirt'],
-    }
-
     # Ceph + Libvirt
     $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false)
     $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'],
       }
diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp
new file mode 100644
index 0000000..29ef372
--- /dev/null
+++ b/manifests/profile/base/nova/libvirt.pp
@@ -0,0 +1,49 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: tripleo::profile::base::nova::libvirt
+#
+# Libvirt profile for tripleo. It will deploy Libvirt service and configure it.
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::nova::libvirt (
+  $step = hiera('step'),
+) {
+
+  if $step >= 4 {
+    include ::tripleo::profile::base::nova
+    include ::nova::compute::libvirt::services
+
+    file { ['/etc/libvirt/qemu/networks/autostart/default.xml',
+      '/etc/libvirt/qemu/networks/default.xml']:
+      ensure => absent,
+      before => Service['libvirt'],
+    }
+
+    # in case libvirt has been already running before the Puppet run, make
+    # sure the default network is destroyed
+    exec { 'libvirt-default-net-destroy':
+      command => '/usr/bin/virsh net-destroy default',
+      onlyif  => '/usr/bin/virsh net-info default | /bin/grep -i "^active:\s*yes"',
+      before  => Service['libvirt'],
+    }
+  }
+
+}