From b97905959a4eb531ad22a573b10c9bfbd74dcd0b Mon Sep 17 00:00:00 2001 From: P-O Quirion Date: Thu, 28 Mar 2024 12:42:23 -0400 Subject: [PATCH] merge cephFS and NFS device as valide for account creation --- site/profile/manifests/accounts.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/profile/manifests/accounts.pp b/site/profile/manifests/accounts.pp index 0cb83b419..ceee5af0b 100644 --- a/site/profile/manifests/accounts.pp +++ b/site/profile/manifests/accounts.pp @@ -12,10 +12,10 @@ Mount <| |> -> Service['mkhome'] Mount <| |> -> Service['mkproject'] - $nfs_devices = lookup('profile::nfs::server::devices', undef, undef, {}) - $with_home = 'home' in $nfs_devices - $with_project = 'project' in $nfs_devices - $with_scratch = 'scratch' in $nfs_devices + $devices = merge (lookup('profile::ceph::client::shares', undef, undef, {}), lookup('profile::nfs::server::devices', undef, undef, {})) + $with_home = 'home' in $devices + $with_project = 'project' in $devices + $with_scratch = 'scratch' in $devices package { 'rsync': ensure => 'installed',