From 91b1e26d701f67c65cc086ea5836a0fa6abb83c6 Mon Sep 17 00:00:00 2001 From: Donald Talton Date: Thu, 20 Feb 2014 12:56:01 -0800 Subject: [PATCH] Added NFS max use and oversub ratios Added the ability to configure additional cinder options for allocating the over-subscription ratio and for setting the max disk use ratio. Change-Id: I5387563d5cc869e8be38c8d5a4d9c0d0fc3be469 --- manifests/volume/nfs.pp | 6 +++++- spec/classes/cinder_volume_nfs_spec.rb | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/manifests/volume/nfs.pp b/manifests/volume/nfs.pp index ffdbbaf0..4b2f1632 100644 --- a/manifests/volume/nfs.pp +++ b/manifests/volume/nfs.pp @@ -5,7 +5,9 @@ class cinder::volume::nfs ( $nfs_disk_util = undef, $nfs_sparsed_volumes = undef, $nfs_mount_point_base = undef, - $nfs_shares_config = '/etc/cinder/shares.conf' + $nfs_shares_config = '/etc/cinder/shares.conf', + $nfs_used_ratio = '0.95', + $nfs_oversub_ratio = '1.0', ) { file {$nfs_shares_config: @@ -22,5 +24,7 @@ class cinder::volume::nfs ( 'DEFAULT/nfs_disk_util': value => $nfs_disk_util; 'DEFAULT/nfs_sparsed_volumes': value => $nfs_sparsed_volumes; 'DEFAULT/nfs_mount_point_base': value => $nfs_mount_point_base; + 'DEFAULT/nfs_used_ratio': value => $nfs_used_ratio; + 'DEFAULT/nfs_oversub_ratio': value => $nfs_oversub_ratio; } } diff --git a/spec/classes/cinder_volume_nfs_spec.rb b/spec/classes/cinder_volume_nfs_spec.rb index 033ea2c4..449153fc 100644 --- a/spec/classes/cinder_volume_nfs_spec.rb +++ b/spec/classes/cinder_volume_nfs_spec.rb @@ -10,6 +10,8 @@ describe 'cinder::volume::nfs' do :nfs_disk_util => 'du', :nfs_sparsed_volumes => true, :nfs_mount_point_base => '/cinder_mount_point', + :nfs_used_ratio => '0.95', + :nfs_oversub_ratio => '1.0', } end @@ -27,6 +29,10 @@ describe 'cinder::volume::nfs' do '/cinder_mount_point') should contain_cinder_config('DEFAULT/nfs_disk_util').with_value( 'du') + should contain_cinder_config('DEFAULT/nfs_used_ratio').with_value( + '0.95') + should contain_cinder_config('DEFAULT/nfs_oversub_ratio').with_value( + '1.0') should contain_file('/etc/cinder/other_shares.conf').with( :content => "10.10.10.10:/shares\n10.10.10.10:/shares2", :require => 'Package[cinder]',