Skip to content

Commit c9560bf

Browse files
committed
Do not use = for to set storage driver - fixes starting of docker-storage-setup service
On RedHat based systems the sysconfig file is parsed by container-storage-setup, which does not expect an equal sign when looking for the storage-driver ( https://github.com/projectatomic/container-storage-setup/blob/413b4080c0b9346a242d88137bb3e9e0a6aa25f9/container-storage-setup.sh#L1193 ). This makes the docker-storage-setup service failing on startup: Jul 20 20:49:05 docker.example.com systemd[1]: Starting Docker Storage Setup... Jul 20 20:49:06 docker.example.com container-storage-setup[781]: ERROR: Failed to determine existing storage driver. Jul 20 20:49:07 docker.example.com systemd[1]: docker-storage-setup.service: main process exited, code=exited, status=1/FAILURE Jul 20 20:49:07 docker.example.com systemd[1]: Failed to start Docker Storage Setup. Removing the = sign makes everybody happy.
1 parent d42cb42 commit c9560bf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

spec/classes/docker_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@
340340
'storage_driver' => 'devicemapper',
341341
'dm_basesize' => '3G'
342342
}}
343-
it { should contain_file('/etc/sysconfig/docker-storage').with_content(/^(DOCKER_STORAGE_OPTIONS=" --storage-driver=devicemapper --storage-opt dm.basesize=3G)/) }
343+
it { should contain_file('/etc/sysconfig/docker-storage').with_content(/^(DOCKER_STORAGE_OPTIONS=" --storage-driver devicemapper --storage-opt dm.basesize=3G)/) }
344344
end
345345

346346
context 'It should include default prerequired_packages' do
@@ -485,7 +485,7 @@
485485
['aufs', 'devicemapper', 'btrfs', 'overlay', 'overlay2', 'vfs', 'zfs'].each do |driver|
486486
context "with #{driver} storage driver" do
487487
let(:params) { { 'storage_driver' => driver }}
488-
it { should contain_file(storage_config_file).with_content(/ --storage-driver=#{driver}/) }
488+
it { should contain_file(storage_config_file).with_content(/ --storage-driver #{driver}/) }
489489
end
490490
end
491491

templates/etc/sysconfig/docker-storage.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# DOCKER_STORAGE_OPTIONS = --storage-opt dm.metadatadev=/dev/mylogvol/my-docker-metadata --storage-opt dm.datadev=/dev/mylogvol/my-docker-data
1616

1717
DOCKER_STORAGE_OPTIONS="<% -%>
18-
<% if @storage_driver %> --storage-driver=<%= @storage_driver %><% end -%>
18+
<% if @storage_driver %> --storage-driver <%= @storage_driver %><% end -%>
1919
<% if @storage_driver == 'devicemapper' -%>
2020
<%- if @dm_basesize %> --storage-opt dm.basesize=<%= @dm_basesize %><% end -%>
2121
<%- if @dm_fs %> --storage-opt dm.fs=<%= @dm_fs %><% end -%>

0 commit comments

Comments
 (0)