Fixes #104, Fixes #106.

voxpupuli · Sep 11, 2015 · fc4994f · fc4994f
1 parent f83f75e
commit fc4994f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/spec/classes/cassandra_template1_spec.rb b/spec/classes/cassandra_template1_spec.rb
@@ -85,6 +85,9 @@
         :trickle_fsync_interval_in_kb             => 'trickle_fsync_interval_in_kb',
         :truncate_request_timeout_in_ms           => 'truncate_request_timeout_in_ms',
         :write_request_timeout_in_ms              => 'write_request_timeout_in_ms',
+        :commitlog_directory                      => 'commitlog_directory',
+        :saved_caches_directory                   => 'saved_caches_directory',
+        :data_file_directories                    => ['datadir1', 'datadir2'],
       }
     end
 
@@ -142,5 +145,9 @@
     it { should contain_file('/etc/cassandra.yaml').with_content(/trickle_fsync_interval_in_kb: trickle_fsync_interval_in_kb/) }
     it { should contain_file('/etc/cassandra.yaml').with_content(/truncate_request_timeout_in_ms: truncate_request_timeout_in_ms/) }
     it { should contain_file('/etc/cassandra.yaml').with_content(/write_request_timeout_in_ms: write_request_timeout_in_ms/) }
+    it { should contain_file('/etc/cassandra.yaml').with_content(/commitlog_directory: commitlog_directory/) }
+    it { should contain_file('/etc/cassandra.yaml').with_content(/saved_caches_directory: saved_caches_directory/) }
+    it { should contain_file('/etc/cassandra.yaml').with_content(/    - datadir1/) }
+    it { should contain_file('/etc/cassandra.yaml').with_content(/    - datadir2/) }
   end
 end
diff --git a/spec/classes/cassandra_template2_spec.rb b/spec/classes/cassandra_template2_spec.rb
@@ -88,6 +88,9 @@
         :trickle_fsync_interval_in_kb             => 'trickle_fsync_interval_in_kb',
         :truncate_request_timeout_in_ms           => 'truncate_request_timeout_in_ms',
         :write_request_timeout_in_ms              => 'write_request_timeout_in_ms',
+        :commitlog_directory                      => 'commitlog_directory',
+        :saved_caches_directory                   => 'saved_caches_directory',
+        :data_file_directories                    => ['datadir1', 'datadir2'],
       }
     end
 
@@ -158,5 +161,9 @@
     it { should contain_file('/etc/cassandra.yaml').with_content(/trickle_fsync_interval_in_kb: trickle_fsync_interval_in_kb/) }
     it { should contain_file('/etc/cassandra.yaml').with_content(/truncate_request_timeout_in_ms: truncate_request_timeout_in_ms/) }
     it { should contain_file('/etc/cassandra.yaml').with_content(/write_request_timeout_in_ms: write_request_timeout_in_ms/) }
+    it { should contain_file('/etc/cassandra.yaml').with_content(/commitlog_directory: commitlog_directory/) }
+    it { should contain_file('/etc/cassandra.yaml').with_content(/saved_caches_directory: saved_caches_directory/) }
+    it { should contain_file('/etc/cassandra.yaml').with_content(/    - datadir1/) }
+    it { should contain_file('/etc/cassandra.yaml').with_content(/    - datadir2/) }
   end
 end