Merge pull request #115 from camptocamp/features/safe_dirs

Add support for datastore safedirs

Author: rwaffen

lib/puppet/provider/onedatastore/cli.rb

@@ -30,6 +30,9 @@ def create
 NAME = <%= resource[:name] %>
 TM_MAD = <%= resource[:tm] %>
 TYPE = <%= resource[:type].to_s.upcase %>
+<% if resource[:safe_dirs] %>
+SAFE_DIRS = <%= resource[:safe_dirs].join(' ') %>
+<% end %>
 <% if resource[:dm] %>
 DS_MAD = <%= resource[:dm] %>
 <% end %>
@@ -54,12 +57,13 @@ def exists?
   def self.instances
     REXML::Document.new(onedatastore('list', '-x')).elements.collect("DATASTORE_POOL/DATASTORE") do |datastore|
       new(
-        :name     => datastore.elements["NAME"].text,
-        :ensure   => :present,
-        :type     => datastore.elements["TEMPLATE/TYPE"].text,
-        :dm       => (datastore.elements["TEMPLATE/DS_MAD"].text unless datastore.elements["TEMPLATE/DS_MAD"].nil?),
-        :tm       =>( datastore.elements["TEMPLATE/TM_MAD"].text unless datastore.elements["TEMPLATE/TM_MAD"].nil?),
-        :disktype => {0 => 'file', 1 => 'block', 2 => 'rdb'}[datastore.elements["DISK_TYPE"].text]
+        :name      => datastore.elements["NAME"].text,
+        :ensure    => :present,
+        :type      => datastore.elements["TEMPLATE/TYPE"].text,
+        :dm        => (datastore.elements["TEMPLATE/DS_MAD"].text unless datastore.elements["TEMPLATE/DS_MAD"].nil?),
+        :safe_dirs => (datastore.elements["TEMPLATE/SAFE_DIRS"].text.split(' ') unless datastore.elements["TEMPLATE/SAFE_DIRS"].nil?),
+        :tm        => ( datastore.elements["TEMPLATE/TM_MAD"].text unless datastore.elements["TEMPLATE/TM_MAD"].nil?),
+        :disktype  => {0 => 'file', 1 => 'block', 2 => 'rdb'}[datastore.elements["DISK_TYPE"].text]
        )
     end
   end

lib/puppet/type/onedatastore.rb

@@ -40,9 +40,9 @@
     desc "Choose a disk type: file, block, rdb"
   end
 
-#  newproperty(:safedirs, :array_matching => :all) do
-#      desc "Array of safe directories"
-#  end
+  newproperty(:safe_dirs, :array_matching => :all) do
+    desc "Array of safe directories"
+  end
 
 #  newproperty(:restricteddirs, :array_matching => :all) do
 #      desc "Array of restricted directory names"

spec/acceptance/onedatastore_spec.rb

@@ -27,7 +27,6 @@ class { 'one':
 
   describe 'when creating a Files datastore' do
     it 'should idempotently run' do
-      pending 'missing safe_dirs property'
       pp = <<-EOS
       onedatastore { 'kernels':
         dm        => 'fs',