Merge pull request #263 from puppetlabs/CLOUD-1900

Cloud 1900

Author: davejrt

manifests/init.pp

@@ -517,8 +517,14 @@
   }
 
   if $storage_driver {
-    assert_type(Pattern[/^(aufs|devicemapper|btrfs|overlay|overlay2|vfs|zfs)$/], $storage_driver) |$a, $b| {
-      fail translate(('Valid values for storage_driver are aufs, devicemapper, btrfs, overlay, overlay2, vfs, zfs.'))
+    if $::osfamily == 'windows' {
+      assert_type(Pattern[/^(windowsfilter)$/], $storage_driver) |$a, $b| {
+          fail translate(('Valid values for storage_driver on windows are windowsfilter'))
+      }
+    } else {
+      assert_type(Pattern[/^(aufs|devicemapper|btrfs|overlay|overlay2|vfs|zfs)$/], $storage_driver) |$a, $b| {
+        fail translate(('Valid values for storage_driver are aufs, devicemapper, btrfs, overlay, overlay2, vfs, zfs.'))
+      }
     }
   }
 

spec/classes/docker_windows_spec.rb

@@ -123,7 +123,27 @@
             }.to raise_error(Puppet::Error, /log_level must be one of debug, info, warn, error or fatal/)
         end
       end
+
+      context 'with storage_driver' do
+        let(:params) { {
+            'storage_driver' => 'windowsfilter',
+            'docker_ee' => true 
+        } }
+        it { should compile.with_all_deps }
+      end
 
+      context 'with an invalid storage_driver' do
+        let(:params) { {
+            'storage_driver' => 'invalid',
+            'docker_ee' => true 
+        } }
+        it do
+            expect {
+              should contain_package('docker')
+            }.to raise_error(Puppet::Error, /Valid values for storage_driver on windows are windowsfilter/)
+        end
+      end
+
       context 'with tcp_bind' do
         let(:params) { { 
             'tcp_bind'   => "tcp://0.0.0.0:2376",