Merge pull request #168 from glorpen/noreplica

Allow volumes without replicas

Author: ekohl

manifests/volume.pp

@@ -69,12 +69,12 @@
   if $replica {
     $_replica = "replica ${replica}"
   } else {
-    $_replica = undef
+    $_replica = ''
   }
 
   $_transport = "transport ${transport}"
 
-  if $options {
+  if $options and ! empty( $options ) {
     $_options = sort( $options )
   } else {
     $_options = undef

spec/classes/init_spec.rb

@@ -139,6 +139,39 @@
         end
       end
 
+      context 'when volumes defined without replica' do
+        let :facts do
+          super().merge(
+            gluster_binary: '/sbin/gluster',
+            gluster_peer_list: 'example1,example2',
+            gluster_volume_list: 'gl1.example.com:/glusterfs/backup,gl2.example.com:/glusterfs/backup'
+          )
+        end
+        let :params do
+          {
+            volumes:
+            {
+              'data1' => {
+                'bricks'  => ['srv1.local:/brick1/brick', 'srv2.local:/brick1/brick']
+              }
+            }
+          }
+        end
+
+        it 'creates gluster::volume' do
+          is_expected.to contain_gluster__volume('data1').with(
+            name: 'data1',
+            replica: nil,
+            bricks: ['srv1.local:/brick1/brick', 'srv2.local:/brick1/brick']
+          )
+        end
+        it 'executes command without replica' do
+          is_expected.not_to contain_exec('gluster create volume data1').with(
+            command: %r{.* replica .*}
+          )
+        end
+      end
+
       context 'when volumes incorrectly defined' do
         let :params do
           {

spec/defines/volume_spec.rb

@@ -107,4 +107,16 @@
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to contain_exec("gluster create volume #{title}") }
   end
+  describe 'with empty options' do
+    let(:facts) do
+      {
+        gluster_binary: '/usr/sbin/gluster'
+      }
+    end
+    let(:params) do
+      super().merge(options: [])
+    end
+
+    it { is_expected.to compile.with_all_deps }
+  end
 end