Merge pull request #291 from duritong/fix-docker-storage-setup-service

Do not use = for to set storage driver - fixes starting of docker-sto…

Author: davejrt

spec/classes/docker_spec.rb

@@ -340,7 +340,7 @@
             'storage_driver' => 'devicemapper',
             'dm_basesize'  => '3G'
           }}
-          it { should contain_file('/etc/sysconfig/docker-storage').with_content(/^(DOCKER_STORAGE_OPTIONS=" --storage-driver=devicemapper --storage-opt dm.basesize=3G)/) }
+          it { should contain_file('/etc/sysconfig/docker-storage').with_content(/^(DOCKER_STORAGE_OPTIONS=" --storage-driver devicemapper --storage-opt dm.basesize=3G)/) }
         end
 
         context 'It should include default prerequired_packages' do
@@ -485,7 +485,7 @@
       ['aufs', 'devicemapper', 'btrfs', 'overlay', 'overlay2', 'vfs', 'zfs'].each do |driver|
         context "with #{driver} storage driver" do
           let(:params) { { 'storage_driver' => driver }}
-          it { should contain_file(storage_config_file).with_content(/ --storage-driver=#{driver}/) }
+          it { should contain_file(storage_config_file).with_content(/ --storage-driver #{driver}/) }
         end
       end
 

templates/etc/sysconfig/docker-storage.erb

@@ -15,7 +15,7 @@
 # DOCKER_STORAGE_OPTIONS = --storage-opt dm.metadatadev=/dev/mylogvol/my-docker-metadata --storage-opt dm.datadev=/dev/mylogvol/my-docker-data
 
 DOCKER_STORAGE_OPTIONS="<% -%>
-<% if @storage_driver %> --storage-driver=<%= @storage_driver %><% end -%>
+<% if @storage_driver %> --storage-driver <%= @storage_driver %><% end -%>
 <% if @storage_driver == 'devicemapper' -%>
   <%- if @dm_basesize %> --storage-opt dm.basesize=<%= @dm_basesize %><% end -%>
   <%- if @dm_fs %> --storage-opt dm.fs=<%= @dm_fs %><% end -%>