4 files changed, 32 insertions, 4 deletions
diff --git a/manifests/profile/base/ceph.pp b/manifests/profile/base/ceph.pp
index 29ca9ae..94166ac 100644
--- a/manifests/profile/base/ceph.pp
+++ b/manifests/profile/base/ceph.pp
@@ -35,6 +35,10 @@
 #   mon_host when ceph_ipv6 is true
 #   Defaults to undef
 #
+# [*enable_ceph_storage*]
+#   (Optional) enable_ceph_storage
+#   Deprecated: defaults to false
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
@@ -45,6 +49,7 @@ class tripleo::profile::base::ceph (
   $ceph_mon_initial_members = undef,
   $ceph_mon_host            = undef,
   $ceph_mon_host_v6         = undef,
+  $enable_ceph_storage      = false,
   $step                     = hiera('step'),
 ) {
 
@@ -67,4 +72,9 @@ class tripleo::profile::base::ceph (
 
     include ::ceph::conf
   }
+
+  # TODO: deprecated boolean
+  if $enable_ceph_storage {
+    include ::tripleo::profile::base::ceph::osd
+  }
 }
diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp
index d0c77e9..a9224d3 100644
--- a/manifests/profile/base/ceph/osd.pp
+++ b/manifests/profile/base/ceph/osd.pp
@@ -20,7 +20,7 @@
 #
 # [*ceph_osd_selinux_permissive*]
 #   (Optional) Wheter to configure SELinux in permissive mode
-#   Default to true
+#   Default to false
 #
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ceph::osd (
-  $ceph_osd_selinux_permissive = true,
+  $ceph_osd_selinux_permissive = false,
   $step                        = hiera('step'),
 ) {
 
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 74af7fc..5b6f895 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -35,7 +35,7 @@ class tripleo::profile::base::nova::compute::libvirt (
     $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'],
       }