Skip to content

Commit 6d9828c

Browse files
praj1001praj1001
committed
Updated the spaces in epp files
1 parent bc9d7ef commit 6d9828c

File tree

11 files changed

+162
-161
lines changed

11 files changed

+162
-161
lines changed

‎templates/docker-run-start.epp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<% if $before_start { %>
1+
<% if $before_start { -%>
22
<%= $before_start %>
33
<% } -%>
4-
<% if $remove_container_on_start { %>
4+
<% if $remove_container_on_start { -%>
55
/usr/bin/<%= $docker_command %> rm <% if $remove_volume_on_start { %>-v<% } %> <%= $sanitised_title %> >/dev/null 2>&1
66
<% } -%>
77

8-
<% if $pull_on_start { %>
8+
<% if $pull_on_start { -%>
99
/usr/bin/<%= $docker_command %> pull <%= $image %>
1010
<% } -%>
1111

12-
<% if $verify_digest { %>
12+
<% if $verify_digest { -%>
1313
digest_local=$(docker image inspect <%= $image %> --format='{{index .RepoDigests 0}}')
1414
digest_verify="<%= $verify_digest %>"
1515
if [ "${digest_local##*:}" != "${digest_verify##*:}" ]; then
@@ -32,6 +32,6 @@
3232
<% } %>
3333

3434
/usr/bin/<%= $docker_command %> start <% if ! $valid_detach { %>-a<% } %> <%= $sanitised_title %>
35-
<% if $after_start { %>
35+
<% if $after_start { -%>
3636
<%= $after_start %>
3737
<% } -%>

‎templates/docker-run-stop.epp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<% if $remove_container_on_stop { -%>
66
/usr/bin/<%= $docker_command %> rm <% if $remove_volume_on_stop { %>-v<% } %> <%= $sanitised_title %>
77
<% } -%>
8-
<% if $after_stop { %>
8+
<% if $after_stop { -%>
99
<%= $after_stop %>
1010
<% } -%>

‎templates/etc/conf.d/docker.epp

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,52 @@
44
DOCKER="/usr/bin/<%= $docker_start_command %>"
55

66
other_args="<% -%>
7-
<% if $root_dir { %><%= $root_dir_flag %> <%= $root_dir %><% } %>
8-
<% if $tcp_bind { %><% $tcp_bind_array.each |$param| { %> -H <%= $param %><% } %><% } %>
9-
<% if $tls_enable { %> --tls<% if $tls_verify { %> --tlsverify<% } %> --tlscacert=<%= $tls_cacert %> --tlscert=<%= $tls_cert %> --tlskey=<%= $tls_key %><% } %>
10-
<% if $socket_bind { %> -H <%= $socket_bind %><% } %>
7+
<% if $root_dir { %><%= $root_dir_flag %> <%= $root_dir %><% } -%>
8+
<% if $tcp_bind { %><% $tcp_bind_array.each |$param| { %> -H <%= $param %><% } %><% } -%>
9+
<% if $tls_enable { %> --tls<% if $tls_verify { %> --tlsverify<% } %> --tlscacert=<%= $tls_cacert %> --tlscert=<%= $tls_cert %> --tlskey=<%= $tls_key %><% } -%>
10+
<% if $socket_bind { %> -H <%= $socket_bind %><% } -%>
1111
--ip-forward=<%= $ip_forward -%>
1212
--iptables=<%= $iptables -%>
1313
--ip-masq=<%= $ip_masq -%>
14-
<% if $icc { %> --icc=<%= $icc %><% } %>
15-
<% if $fixed_cidr { %> --fixed-cidr <%= $fixed_cidr %><% } %>
16-
<% if $default_gateway { %> --default-gateway <%= $default_gateway %><% } %>
17-
<% if $bridge { %> --bridge <%= $bridge %><% } %>
18-
<% if $log_level { %> -l <%= $log_level %><% } %>
19-
<% if $log_driver { %> --log-driver <%= $log_driver %><% } %>
20-
<% if $log_driver { %><% if $log_opt { %><% $log_opt.each |$param| { %> --log-opt <%= $param %><% } %><% } %><% } %>
21-
<% if $selinux_enabled { %> --selinux-enabled=<%= $selinux_enabled %><% } %>
22-
<% if $socket_group { %> -G <%= $socket_group %><% } %>
23-
<% if $dns { %><% $dns_array.each |$address| { %> --dns <%= $address %><% } %><% } %>
24-
<% if $dns_search { %><% $dns_search_array.each |$domain| { %> --dns-search <%= $domain %><% } %><% } %>
25-
<% if $execdriver { %> -e <%= $execdriver %><% } %>
26-
<% if $storage_driver { %> --storage-driver=<%= $storage_driver %><% } %>
14+
<% if $icc { %> --icc=<%= $icc %><% } -%>
15+
<% if $fixed_cidr { %> --fixed-cidr <%= $fixed_cidr %><% } -%>
16+
<% if $default_gateway { %> --default-gateway <%= $default_gateway %><% } -%>
17+
<% if $bridge { %> --bridge <%= $bridge %><% } -%>
18+
<% if $log_level { %> -l <%= $log_level %><% } -%>
19+
<% if $log_driver { %> --log-driver <%= $log_driver %><% } -%>
20+
<% if $log_driver { %><% if $log_opt { %><% $log_opt.each |$param| { %> --log-opt <%= $param %><% } %><% } -%><% } -%>
21+
<% if $selinux_enabled { %> --selinux-enabled=<%= $selinux_enabled %><% } -%>
22+
<% if $socket_group { %> -G <%= $socket_group %><% } -%>
23+
<% if $dns { %><% $dns_array.each |$address| { %> --dns <%= $address %><% } %><% } -%>
24+
<% if $dns_search { %><% $dns_search_array.each |$domain| { %> --dns-search <%= $domain %><% } %><% } -%>
25+
<% if $execdriver { %> -e <%= $execdriver %><% } -%>
26+
<% if $storage_driver { %> --storage-driver=<%= $storage_driver %><% } -%>
2727
<% if $storage_driver == 'devicemapper' { -%>
28-
<%- if $dm_basesize { %> --storage-opt dm.basesize=<%= $dm_basesize %><% } %>
29-
<%- if $dm_fs { %> --storage-opt dm.fs=<%= $dm_fs %><% } %>
30-
<%- if $dm_mkfsarg { %> --storage-opt "dm.mkfsarg=<%= $dm_mkfsarg %>"<% } %>
31-
<%- if $dm_mountopt { %> --storage-opt dm.mountopt=<%= $dm_mountopt %><% } %>
32-
<%- if $dm_blocksize { %> --storage-opt dm.blocksize=<%= $dm_blocksize %><% } %>
33-
<%- if $dm_loopdatasize { %> --storage-opt dm.loopdatasize=<%= $dm_loopdatasize %><% } %>
34-
<%- if $dm_loopmetadatasize { %> --storage-opt dm.loopmetadatasize=<%= $dm_loopmetadatasize %><% } %>
35-
<%- if $dm_thinpooldev { %> --storage-opt dm.thinpooldev=<%= $dm_thinpooldev %><% }
36-
else { %>
37-
<%- if $dm_datadev { %> --storage-opt dm.datadev=<%= $dm_datadev %><% } %>
38-
<%- if $dm_metadatadev { %> --storage-opt dm.metadatadev=<%= $dm_metadatadev %><% } %>
39-
<% } %>
40-
<%- if $dm_use_deferred_removal { %> --storage-opt dm.use_deferred_removal=<%= $dm_use_deferred_removal %><% } %>
41-
<%- if $dm_use_deferred_deletion { %> --storage-opt dm.use_deferred_deletion=<%= $dm_use_deferred_deletion %><% } %>
42-
<%- if $dm_blkdiscard { %> --storage-opt dm.blkdiscard=<%= $dm_blkdiscard %><% } %>
43-
<%- if $dm_override_udev_sync_check { %> --storage-opt dm.override_udev_sync_check=<%= $dm_override_udev_sync_check %><% } %>
28+
<%- if $dm_basesize { %> --storage-opt dm.basesize=<%= $dm_basesize %><% } -%>
29+
<%- if $dm_fs { %> --storage-opt dm.fs=<%= $dm_fs %><% } -%>
30+
<%- if $dm_mkfsarg { %> --storage-opt "dm.mkfsarg=<%= $dm_mkfsarg %>"<% } -%>
31+
<%- if $dm_mountopt { %> --storage-opt dm.mountopt=<%= $dm_mountopt %><% } -%>
32+
<%- if $dm_blocksize { %> --storage-opt dm.blocksize=<%= $dm_blocksize %><% } -%>
33+
<%- if $dm_loopdatasize { %> --storage-opt dm.loopdatasize=<%= $dm_loopdatasize %><% } -%>
34+
<%- if $dm_loopmetadatasize { %> --storage-opt dm.loopmetadatasize=<%= $dm_loopmetadatasize %><% } -%>
35+
<%- if $dm_thinpooldev { %> --storage-opt dm.thinpooldev=<%= $dm_thinpooldev -%>
36+
<%- }else { -%>
37+
<%- if $dm_datadev { %> --storage-opt dm.datadev=<%= $dm_datadev %><% } -%>
38+
<%- if $dm_metadatadev { %> --storage-opt dm.metadatadev=<%= $dm_metadatadev %><% } -%>
39+
<%- } -%>
40+
<%- if $dm_use_deferred_removal { %> --storage-opt dm.use_deferred_removal=<%= $dm_use_deferred_removal %><% } -%>
41+
<%- if $dm_use_deferred_deletion { %> --storage-opt dm.use_deferred_deletion=<%= $dm_use_deferred_deletion %><% } -%>
42+
<%- if $dm_blkdiscard { %> --storage-opt dm.blkdiscard=<%= $dm_blkdiscard %><% } -%>
43+
<%- if $dm_override_udev_sync_check { %> --storage-opt dm.override_udev_sync_check=<%= $dm_override_udev_sync_check %><% } -%>
4444
<% } elsif $storage_driver == 'overlay2' { -%>
45-
<%- if $overlay2_override_kernel_check { %> --storage-opt overlay2.override_kernel_check=<%= $overlay2_override_kernel_check %><% } %>
45+
<%- if $overlay2_override_kernel_check { %> --storage-opt overlay2.override_kernel_check=<%= $overlay2_override_kernel_check %><% } -%>
4646
<% } -%>
47-
<% $labels.each |$label| { %> --label <%= $label %><% } %>
48-
<% if $extra_parameters { %><% $extra_parameters_array.each |$param| { %> <%= $param %><% } %><% } %>
47+
<% $labels.each |$label| { %> --label <%= $label %><% } -%>
48+
<% if $extra_parameters { %><% $extra_parameters_array.each |$param| { %> <%= $param %><% } %><% } -%>
4949
"
5050
<% if $proxy { %>export http_proxy='<%= $proxy %>'
51-
export https_proxy='<%= $proxy %>'<% } -%>
52-
<% if $no_proxy { %>export no_proxy='<%= $no_proxy %>'<% } -%>
51+
export https_proxy='<%= $proxy %>'<% } %>
52+
<% if $no_proxy { %>export no_proxy='<%= $no_proxy %>'<% } %>
5353
# This is also a handy place to tweak where Docker's temporary files go.
5454
export TMPDIR="<%= $tmp_dir %>"
5555
<% if $shell_values { %><% $shell_values_array.each |$param| { %>

‎templates/etc/default/docker.epp

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,52 +19,52 @@ export TMPDIR="<%= $tmp_dir %>"
1919

2020
# # Use DOCKER_OPTS to modify the daemon startup options.
2121
DOCKER_OPTS="\
22-
<% if $root_dir { %><%= $root_dir_flag %> <%= $root_dir %><% } %>
23-
<% if $tcp_bind { %><% $tcp_bind_array.each |$param| { %> -H <%= $param %><% } %><% } %>
24-
<% if $tls_enable { %> --tls<% if $tls_verify { %> --tlsverify<% } %> --tlscacert=<%= $tls_cacert %> --tlscert=<%= $tls_cert %> --tlskey=<%= $tls_key %><% } %>
25-
<% if $socket_bind { %> -H <%= $socket_bind %><% } %>
22+
<% if $root_dir { %><%= $root_dir_flag %> <%= $root_dir %><% } -%>
23+
<% if $tcp_bind { %><% $tcp_bind_array.each |$param| { %> -H <%= $param %><% } %><% } -%>
24+
<% if $tls_enable { %> --tls<% if $tls_verify { %> --tlsverify<% } %> --tlscacert=<%= $tls_cacert %> --tlscert=<%= $tls_cert %> --tlskey=<%= $tls_key %><% } -%>
25+
<% if $socket_bind { %> -H <%= $socket_bind %><% } -%>
2626
--ip-forward=<%= $ip_forward -%>
2727
--iptables=<%= $iptables -%>
2828
--ip-masq=<%= $ip_masq -%>
29-
<% if $icc { %> --icc=<%= $icc %><% } %>
30-
<% if $fixed_cidr { %> --fixed-cidr <%= $fixed_cidr %><% } %>
31-
<% if $bridge { %> --bridge <%= $bridge %><% } %>
32-
<% if $default_gateway { %> --default-gateway <%= $default_gateway %><% } %>
33-
<% if $log_level { %> -l <%= $log_level %><% } %>
34-
<% if $log_driver { %> --log-driver <%= $log_driver %><% } %>
35-
<% if $log_driver { %><% if $log_opt { %><% $log_opt.each |$param| { %> --log-opt <%= $param %><% } %><% } %><% } %>
36-
<% if $selinux_enabled { %> --selinux-enabled=<%= $selinux_enabled %><% } %>
37-
<% if $socket_group { %> -G <%= $socket_group %><% } %>
38-
<% if $dns { %><% $dns_array.each |$address| { %> --dns <%= $address %><% } %><% } %>
39-
<% if $dns_search { %><% $dns_search_array.each |$domain| { %> --dns-search <%= $domain %><% } %><% } %>
40-
<% if $execdriver { %> -e <%= $execdriver %><% } %>
41-
<% if $bip { %> --bip=<%= $bip %><% } %>
42-
<% if $mtu { %> --mtu=<%= $mtu %><% } %>
43-
<% if type($registry_mirror, 'generalized') == String { %> --registry-mirror=<%= $registry_mirror %><% } %>
44-
<% if String(type($registry_mirror, 'generalized')).index('Array') == 0 { %><% $registry_mirror.each |$param| { %> --registry-mirror=<%= $param %><% } %><% } %>
45-
<% if $storage_driver { %> --storage-driver=<%= $storage_driver %><% } %>
29+
<% if $icc { %> --icc=<%= $icc %><% } -%>
30+
<% if $fixed_cidr { %> --fixed-cidr <%= $fixed_cidr %><% } -%>
31+
<% if $bridge { %> --bridge <%= $bridge %><% } -%>
32+
<% if $default_gateway { %> --default-gateway <%= $default_gateway %><% } -%>
33+
<% if $log_level { %> -l <%= $log_level %><% } -%>
34+
<% if $log_driver { %> --log-driver <%= $log_driver %><% } -%>
35+
<% if $log_driver { %><% if $log_opt { %><% $log_opt.each |$param| { %> --log-opt <%= $param %><% } %><% } -%><% } -%>
36+
<% if $selinux_enabled { %> --selinux-enabled=<%= $selinux_enabled %><% } -%>
37+
<% if $socket_group { %> -G <%= $socket_group %><% } -%>
38+
<% if $dns { %><% $dns_array.each |$address| { %> --dns <%= $address %><% } %><% } -%>
39+
<% if $dns_search { %><% $dns_search_array.each |$domain| { %> --dns-search <%= $domain %><% } %><% } -%>
40+
<% if $execdriver { %> -e <%= $execdriver %><% } -%>
41+
<% if $bip { %> --bip=<%= $bip %><% } -%>
42+
<% if $mtu { %> --mtu=<%= $mtu %><% } -%>
43+
<% if type($registry_mirror, 'generalized') == String { %> --registry-mirror=<%= $registry_mirror %><% } -%>
44+
<% if String(type($registry_mirror, 'generalized')).index('Array') == 0 { %><% $registry_mirror.each |$param| { %> --registry-mirror=<%= $param %><% } %><% } -%>
45+
<% if $storage_driver { %> --storage-driver=<%= $storage_driver %><% } -%>
4646
<% if $storage_driver == 'devicemapper' { -%>
47-
<%- if $dm_basesize { %> --storage-opt dm.basesize=<%= $dm_basesize %><% } %>
48-
<%- if $dm_fs { %> --storage-opt dm.fs=<%= $dm_fs %><% } %>
49-
<%- if $dm_mkfsarg { %> --storage-opt "dm.mkfsarg=<%= $dm_mkfsarg %>"<% } %>
50-
<%- if $dm_mountopt { %> --storage-opt dm.mountopt=<%= $dm_mountopt %><% } %>
51-
<%- if $dm_blocksize { %> --storage-opt dm.blocksize=<%= $dm_blocksize %><% } %>
52-
<%- if $dm_loopdatasize { %> --storage-opt dm.loopdatasize=<%= $dm_loopdatasize %><% } %>
53-
<%- if $dm_loopmetadatasize { %> --storage-opt dm.loopmetadatasize=<%= $dm_loopmetadatasize %><% } %>
54-
<%- if $dm_thinpooldev { %> --storage-opt dm.thinpooldev=<%= $dm_thinpooldev %><% }
55-
else { %>
56-
<%- if $dm_datadev { %> --storage-opt dm.datadev=<%= $dm_datadev %><% } %>
57-
<%- if $dm_metadatadev { %> --storage-opt dm.metadatadev=<%= $dm_metadatadev %><% } %>
58-
<% } %>
59-
<%- if $dm_use_deferred_removal { %> --storage-opt dm.use_deferred_removal=<%= $dm_use_deferred_removal %><% } %>
60-
<%- if $dm_use_deferred_deletion { %> --storage-opt dm.use_deferred_deletion=<%= $dm_use_deferred_deletion %><% } %>
61-
<%- if $dm_blkdiscard { %> --storage-opt dm.blkdiscard=<%= $dm_blkdiscard %><% } %>
62-
<%- if $dm_override_udev_sync_check { %> --storage-opt dm.override_udev_sync_check=<%= $dm_override_udev_sync_check %><% } %>
47+
<%- if $dm_basesize { %> --storage-opt dm.basesize=<%= $dm_basesize %><% } -%>
48+
<%- if $dm_fs { %> --storage-opt dm.fs=<%= $dm_fs %><% } -%>
49+
<%- if $dm_mkfsarg { %> --storage-opt "dm.mkfsarg=<%= $dm_mkfsarg %>"<% } -%>
50+
<%- if $dm_mountopt { %> --storage-opt dm.mountopt=<%= $dm_mountopt %><% } -%>
51+
<%- if $dm_blocksize { %> --storage-opt dm.blocksize=<%= $dm_blocksize %><% } -%>
52+
<%- if $dm_loopdatasize { %> --storage-opt dm.loopdatasize=<%= $dm_loopdatasize %><% } -%>
53+
<%- if $dm_loopmetadatasize { %> --storage-opt dm.loopmetadatasize=<%= $dm_loopmetadatasize %><% } -%>
54+
<%- if $dm_thinpooldev { %> --storage-opt dm.thinpooldev=<%= $dm_thinpooldev -%>
55+
<%- }else { -%>
56+
<%- if $dm_datadev { %> --storage-opt dm.datadev=<%= $dm_datadev %><% } -%>
57+
<%- if $dm_metadatadev { %> --storage-opt dm.metadatadev=<%= $dm_metadatadev %><% } -%>
58+
<%- } -%>
59+
<%- if $dm_use_deferred_removal { %> --storage-opt dm.use_deferred_removal=<%= $dm_use_deferred_removal %><% } -%>
60+
<%- if $dm_use_deferred_deletion { %> --storage-opt dm.use_deferred_deletion=<%= $dm_use_deferred_deletion %><% } -%>
61+
<%- if $dm_blkdiscard { %> --storage-opt dm.blkdiscard=<%= $dm_blkdiscard %><% } -%>
62+
<%- if $dm_override_udev_sync_check { %> --storage-opt dm.override_udev_sync_check=<%= $dm_override_udev_sync_check %><% } -%>
6363
<% } elsif $storage_driver == 'overlay2' { -%>
64-
<%- if $overlay2_override_kernel_check { %> --storage-opt overlay2.override_kernel_check=<%= $overlay2_override_kernel_check %><% } %>
64+
<%- if $overlay2_override_kernel_check { %> --storage-opt overlay2.override_kernel_check=<%= $overlay2_override_kernel_check %><% } -%>
6565
<% } -%>
66-
<% $labels.each |$label| { %> --label <%= $label %><% } %>
67-
<% if $extra_parameters { %><% $extra_parameters_array.each |$param| { %> <%= $param %><% } %><% } %>
66+
<% $labels.each |$label| { %> --label <%= $label %><% } -%>
67+
<% if $extra_parameters { %><% $extra_parameters_array.each |$param| { %> <%= $param %><% } %><% } -%>
6868
"
6969
<% if $shell_values { %><% $shell_values_array.each |$param| { %>
7070
<%= $param %><% } %><% } -%>

‎templates/etc/init.d/docker-run.epp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
### BEGIN INIT INFO
2424
# Provides: <%= $service_prefix %><%= $sanitised_title %>
25-
# Required-Start: <%= $required_start.uniq.join(" ") %>
26-
# Required-Stop: <%= $required_stop.uniq.join(" ") %>
25+
# Required-Start: <%= $required_start.unique.join(" ") %>
26+
# Required-Stop: <%= $required_stop.unique.join(" ") %>
2727
# Should-Start:
2828
# Should-Stop:
2929
# Default-Start: 2 3 4 5

‎templates/etc/sysconfig/docker-storage.epp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
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 %><% } %>
18+
<% if $storage_driver { %> --storage-driver=<%= $storage_driver %><% } -%>
1919
<% if $storage_driver == 'devicemapper' { -%>
20-
<%- if $dm_basesize { %> --storage-opt dm.basesize=<%= $dm_basesize %><% } %>
21-
<%- if $dm_fs { %> --storage-opt dm.fs=<%= $dm_fs %><% } %>
22-
<%- if $dm_mkfsarg { %> --storage-opt "dm.mkfsarg=<%= $dm_mkfsarg %>"<% } %>
23-
<%- if $dm_mountopt { %> --storage-opt dm.mountopt=<%= $dm_mountopt %><% } %>
24-
<%- if $dm_blocksize { %> --storage-opt dm.blocksize=<%= $dm_blocksize %><% } %>
25-
<%- if $dm_loopdatasize { %> --storage-opt dm.loopdatasize=<%= $dm_loopdatasize %><% } %>
26-
<%- if $dm_loopmetadatasize { %> --storage-opt dm.loopmetadatasize=<%= $dm_loopmetadatasize %><% } %>
27-
<%- if $dm_thinpooldev { %> --storage-opt dm.thinpooldev=<%= $dm_thinpooldev %><% }
28-
else { %>
29-
<%- if $dm_datadev { %> --storage-opt dm.datadev=<%= $dm_datadev %><% } %>
30-
<%- if $dm_metadatadev { %> --storage-opt dm.metadatadev=<%= $dm_metadatadev %><% } %>
31-
<% } %>
32-
<%- if $dm_use_deferred_removal { %> --storage-opt dm.use_deferred_removal=<%= $dm_use_deferred_removal %><% } %>
33-
<%- if $dm_use_deferred_deletion { %> --storage-opt dm.use_deferred_deletion=<%= $dm_use_deferred_deletion %><% } %>
34-
<%- if $dm_blkdiscard { %> --storage-opt dm.blkdiscard=<%= $dm_blkdiscard %><% } %>
35-
<%- if $dm_override_udev_sync_check { %> --storage-opt dm.override_udev_sync_check=<%= $dm_override_udev_sync_check %><% } %>
20+
<%- if $dm_basesize { %> --storage-opt dm.basesize=<%= $dm_basesize %><% } -%>
21+
<%- if $dm_fs { %> --storage-opt dm.fs=<%= $dm_fs %><% } -%>
22+
<%- if $dm_mkfsarg { %> --storage-opt "dm.mkfsarg=<%= $dm_mkfsarg %>"<% } -%>
23+
<%- if $dm_mountopt { %> --storage-opt dm.mountopt=<%= $dm_mountopt %><% } -%>
24+
<%- if $dm_blocksize { %> --storage-opt dm.blocksize=<%= $dm_blocksize %><% } -%>
25+
<%- if $dm_loopdatasize { %> --storage-opt dm.loopdatasize=<%= $dm_loopdatasize %><% } -%>
26+
<%- if $dm_loopmetadatasize { %> --storage-opt dm.loopmetadatasize=<%= $dm_loopmetadatasize %><% } -%>
27+
<%- if $dm_thinpooldev { %> --storage-opt dm.thinpooldev=<%= $dm_thinpooldev -%>
28+
<%- }else { -%>
29+
<%- if $dm_datadev { %> --storage-opt dm.datadev=<%= $dm_datadev %><% } -%>
30+
<%- if $dm_metadatadev { %> --storage-opt dm.metadatadev=<%= $dm_metadatadev %><% } -%>
31+
<%- } -%>
32+
<%- if $dm_use_deferred_removal { %> --storage-opt dm.use_deferred_removal=<%= $dm_use_deferred_removal %><% } -%>
33+
<%- if $dm_use_deferred_deletion { %> --storage-opt dm.use_deferred_deletion=<%= $dm_use_deferred_deletion %><% } -%>
34+
<%- if $dm_blkdiscard { %> --storage-opt dm.blkdiscard=<%= $dm_blkdiscard %><% } -%>
35+
<%- if $dm_override_udev_sync_check { %> --storage-opt dm.override_udev_sync_check=<%= $dm_override_udev_sync_check %><% } -%>
3636
<% } elsif $storage_driver == 'overlay2' { -%>
37-
<%- if $overlay2_override_kernel_check { %> --storage-opt overlay2.override_kernel_check=<%= $overlay2_override_kernel_check %><% } %>
37+
<%- if $overlay2_override_kernel_check { %> --storage-opt overlay2.override_kernel_check=<%= $overlay2_override_kernel_check %><% } -%>
3838
<% } -%>
3939
"

0 commit comments

Comments
 (0)