Skip to content

Commit 9020545

Browse files
crazymind1337crazymind1337
committed
general lint/indent of parameter lists
1 parent 0530499 commit 9020545

23 files changed

+329
-324
lines changed

‎manifests/compose.pp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#
2929
# [*base_url*]
3030
# The base url for installation
31-
# This allows use of a mirror that follows the same layout as the
31+
# This allows use of a mirror that follows the same layout as the
3232
# official repository
3333
#
3434
# [*raw_url*]
@@ -42,14 +42,14 @@
4242
# Defaults to true
4343
#
4444
class docker::compose(
45-
Optional[Pattern[/^present$|^absent$/]] $ensure = 'present',
46-
Optional[String] $version = $docker::params::compose_version,
47-
Optional[String] $install_path = $docker::params::compose_install_path,
48-
Optional[String] $symlink_name = $docker::params::compose_symlink_name,
49-
Optional[String] $proxy = undef,
50-
Optional[String] $base_url = $docker::params::compose_base_url,
51-
Optional[String] $raw_url = undef,
52-
Optional[Boolean] $curl_ensure = $docker::params::curl_ensure,
45+
Optional[Pattern[/^present$|^absent$/]] $ensure = 'present',
46+
Optional[String] $version = $docker::params::compose_version,
47+
Optional[String] $install_path = $docker::params::compose_install_path,
48+
Optional[String] $symlink_name = $docker::params::compose_symlink_name,
49+
Optional[String] $proxy = undef,
50+
Optional[String] $base_url = $docker::params::compose_base_url,
51+
Optional[String] $raw_url = undef,
52+
Optional[Boolean] $curl_ensure = $docker::params::curl_ensure,
5353
) inherits docker::params {
5454

5555
if $proxy != undef {

‎manifests/exec.pp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
define docker::exec(
66
Optional[Boolean] $detach = false,
77
Optional[Boolean] $interactive = false,
8-
Optional[Array] $env = [],
8+
Optional[Array] $env = [],
99
Optional[Boolean] $tty = false,
10-
Optional[String] $container = undef,
11-
Optional[String] $command = undef,
12-
Optional[String] $unless = undef,
10+
Optional[String] $container = undef,
11+
Optional[String] $command = undef,
12+
Optional[String] $unless = undef,
1313
Optional[Boolean] $sanitise_name = true,
1414
Optional[Boolean] $refreshonly = false,
15-
Optional[String] $onlyif = undef,
15+
Optional[String] $onlyif = undef,
1616
) {
1717
include docker::params
1818

‎manifests/image.pp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
# If you want to load a docker image from specific docker tar
2525
#
2626
define docker::image(
27-
Optional[Pattern[/^(present|absent|latest)$/]] $ensure = 'present',
28-
Optional[Pattern[/^[\S]*$/]] $image = $title,
29-
Optional[String] $image_tag = undef,
30-
Optional[String] $image_digest = undef,
31-
Optional[Boolean] $force = false,
32-
Optional[String] $docker_file = undef,
33-
Optional[String] $docker_dir = undef,
34-
Optional[String] $docker_tar = undef,
27+
Optional[Pattern[/^(present|absent|latest)$/]] $ensure = 'present',
28+
Optional[Pattern[/^[\S]*$/]] $image = $title,
29+
Optional[String] $image_tag = undef,
30+
Optional[String] $image_digest = undef,
31+
Optional[Boolean] $force = false,
32+
Optional[String] $docker_file = undef,
33+
Optional[String] $docker_dir = undef,
34+
Optional[String] $docker_tar = undef,
3535
) {
3636
include docker::params
3737
$docker_command = $docker::params::docker_command

‎manifests/images.pp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# docker::images
2-
class docker::images($images) {
2+
class docker::images(
3+
$images
4+
) {
35
create_resources(docker::image, $images)
46
}

‎manifests/init.pp

Lines changed: 118 additions & 117 deletions
Large diffs are not rendered by default.

‎manifests/install.pp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@
2020
# Default: Docker
2121

2222

23-
class docker::install (
23+
class docker::install(
2424
$version = $docker::version,
2525
$nuget_package_provider_version = $docker::nuget_package_provider_version,
2626
$docker_msft_provider_version = $docker::docker_msft_provider_version,
2727
$docker_ee_package_name = $docker::docker_ee_package_name,
2828
$docker_download_url = $docker::package_location,
2929
$dependent_packages = $docker::dependent_packages,
30-
3130
) {
3231
$docker_start_command = $docker::docker_start_command
3332
if $::osfamily and !::docker::acknowledge_unsupported_os {

‎manifests/networks.pp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# docker::networks
2-
class docker::networks($networks) {
2+
class docker::networks(
3+
$networks
4+
) {
35
create_resources(docker_network, $networks)
46
}

‎manifests/params.pp

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,13 @@
1212
$docker_ce_channel = stable
1313
$docker_ee = false
1414
$docker_ee_start_command = 'dockerd'
15-
if ($::osfamily == 'windows') {
16-
$docker_ee_package_name = 'Docker'
17-
} else {
18-
$docker_ee_package_name = 'docker-ee'
19-
}
2015
$docker_ee_source_location = undef
2116
$docker_ee_key_source = undef
2217
$docker_ee_key_id = undef
2318
$docker_ee_repos = stable
2419
$tcp_bind = undef
2520
$tls_enable = false
2621
$tls_verify = true
27-
if ($::osfamily == 'windows') {
28-
$tls_cacert = "${::docker_program_data_path}/docker/certs.d/ca.pem"
29-
$tls_cert = "${::docker_program_data_path}/docker/certs.d/server-cert.pem"
30-
$tls_key = "${::docker_program_data_path}/docker/certs.d/server-key.pem"
31-
$compose_version = '1.21.2'
32-
$compose_install_path = "${::docker_program_files_path}/Docker"
33-
$machine_install_path = "${::docker_program_files_path}/Docker"
34-
} else {
35-
$tls_cacert = '/etc/docker/tls/ca.pem'
36-
$tls_cert = '/etc/docker/tls/cert.pem'
37-
$tls_key = '/etc/docker/tls/key.pem'
38-
$compose_version = '1.9.0'
39-
$compose_install_path = '/usr/local/bin'
40-
$machine_install_path = '/usr/local/bin'
41-
}
4222
$machine_version = '0.16.1'
4323
$ip_forward = true
4424
$iptables = true
@@ -90,11 +70,6 @@
9070
$overlay2_override_kernel_check = false
9171
$manage_package = true
9272
$package_source = undef
93-
if ($::osfamily == 'windows') {
94-
$docker_command = 'docker'
95-
} else {
96-
$docker_command = 'docker'
97-
}
9873
$service_name_default = 'docker'
9974
$docker_group_default = 'docker'
10075
$storage_devs = undef
@@ -114,11 +89,32 @@
11489
$docker_msft_provider_version = undef
11590
$nuget_package_provider_version = undef
11691

92+
if ($::osfamily == 'windows') {
93+
$docker_ee_package_name = 'Docker'
94+
$tls_cacert = "${::docker_program_data_path}/docker/certs.d/ca.pem"
95+
$tls_cert = "${::docker_program_data_path}/docker/certs.d/server-cert.pem"
96+
$tls_key = "${::docker_program_data_path}/docker/certs.d/server-key.pem"
97+
$compose_version = '1.21.2'
98+
$compose_install_path = "${::docker_program_files_path}/Docker"
99+
$machine_install_path = "${::docker_program_files_path}/Docker"
100+
$docker_command = 'docker'
101+
} else {
102+
$docker_ee_package_name = 'docker-ee'
103+
$tls_cacert = '/etc/docker/tls/ca.pem'
104+
$tls_cert = '/etc/docker/tls/cert.pem'
105+
$tls_key = '/etc/docker/tls/key.pem'
106+
$compose_version = '1.9.0'
107+
$compose_install_path = '/usr/local/bin'
108+
$machine_install_path = '/usr/local/bin'
109+
$docker_command = 'docker'
110+
}
111+
117112
case $::osfamily {
118113
'Debian' : {
119114
case $::operatingsystem {
120115
'Ubuntu' : {
121116
$package_release = "ubuntu-${::lsbdistcodename}"
117+
122118
if (versioncmp($::operatingsystemrelease, '15.04') >= 0) {
123119
$service_provider = 'systemd'
124120
$storage_config = '/etc/default/docker-storage'
@@ -129,6 +125,7 @@
129125
$service_after_override = undef
130126
$service_hasstatus = true
131127
$service_hasrestart = true
128+
132129
include docker::systemd_reload
133130
} else {
134131
$service_config_template = 'docker/etc/default/docker.erb'
@@ -143,7 +140,7 @@
143140
}
144141
}
145142
default: {
146-
$package_release = "debian-${::lsbdistcodename}"
143+
$package_release = "debian-${::lsbdistcodename}"
147144
$service_provider = 'systemd'
148145
$storage_config = '/etc/default/docker-storage'
149146
$service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
@@ -153,6 +150,7 @@
153150
$service_after_override = undef
154151
$service_hasstatus = true
155152
$service_hasrestart = true
153+
156154
include docker::systemd_reload
157155
}
158156
}
@@ -182,19 +180,18 @@
182180
$package_ee_repos = $docker_ee_repos
183181
$package_ee_package_name = $docker_ee_package_name
184182

185-
186183
if ($service_provider == 'systemd') {
187184
$detach_service_in_init = false
188185
} else {
189186
$detach_service_in_init = true
190187
}
191188
}
192189
'RedHat' : {
193-
$service_config = '/etc/sysconfig/docker'
194-
$storage_config = '/etc/sysconfig/docker-storage'
195-
$storage_setup_file = '/etc/sysconfig/docker-storage-setup'
196-
$service_hasstatus = true
197-
$service_hasrestart = true
190+
$service_config = '/etc/sysconfig/docker'
191+
$storage_config = '/etc/sysconfig/docker-storage'
192+
$storage_setup_file = '/etc/sysconfig/docker-storage-setup'
193+
$service_hasstatus = true
194+
$service_hasrestart = true
198195

199196
$service_provider = 'systemd'
200197
$service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
@@ -373,6 +370,6 @@
373370
'RedHat' => ['device-mapper'],
374371
default => [],
375372
}
376-
$dependent_packages = ['docker-ce-cli','containerd.io']
377373

374+
$dependent_packages = ['docker-ce-cli','containerd.io']
378375
}

‎manifests/plugin.pp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,17 @@
4848
#
4949

5050
define docker::plugin(
51-
Optional[Pattern[/^present$|^absent$/]] $ensure = 'present',
52-
String $plugin_name = $title,
53-
Optional[Boolean] $enabled = true,
54-
Optional[String] $timeout = undef,
55-
Optional[String] $plugin_alias = undef,
56-
Optional[Boolean] $disable_on_install = false,
57-
Optional[Boolean] $disable_content_trust = true,
58-
Optional[Boolean] $grant_all_permissions = true,
59-
Optional[Boolean] $force_remove = true,
60-
Optional[Array] $settings = [],
61-
){
62-
51+
Optional[Pattern[/^present$|^absent$/]] $ensure = 'present',
52+
String $plugin_name = $title,
53+
Optional[Boolean] $enabled = true,
54+
Optional[String] $timeout = undef,
55+
Optional[String] $plugin_alias = undef,
56+
Optional[Boolean] $disable_on_install = false,
57+
Optional[Boolean] $disable_content_trust = true,
58+
Optional[Boolean] $grant_all_permissions = true,
59+
Optional[Boolean] $force_remove = true,
60+
Optional[Array] $settings = [],
61+
) {
6362
include docker::params
6463

6564
$docker_command = "${docker::params::docker_command} plugin"

‎manifests/plugins.pp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# docker::plugins
2-
class docker::plugins($plugins) {
2+
class docker::plugins(
3+
$plugins
4+
) {
35
create_resources(docker::plugin, $plugins)
46
}

0 commit comments

Comments
 (0)