diff options
Diffstat (limited to 'manifests/profile/base/nova')
-rw-r--r-- | manifests/profile/base/nova/api.pp | 3 | ||||
-rw-r--r-- | manifests/profile/base/nova/compute.pp | 20 | ||||
-rw-r--r-- | manifests/profile/base/nova/compute/libvirt.pp | 2 |
3 files changed, 21 insertions, 4 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 4297031..c734906 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 { @@ -49,4 +54,17 @@ class tripleo::profile::base::nova::compute ( } } + # 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'], } |