Skip to content

Commit 9d18e68

Browse files
david22swandavid22swan
authored
Merge pull request #901 from puppetlabs/CONT-351-Syntax_update
(CONT-351) Syntax update
2 parents ca30099 + 7a7a5c8 commit 9d18e68

24 files changed

+127
-148
lines changed

‎.puppet-lint.rc

-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
11
--relative
2-
--no-parameter_types-check
3-
--no-legacy_facts-check
4-
--no-top_scope_facts-check
5-
--no-parameter_documentation-check
6-
--no-topscope_variable-check

‎.sync.yml

-7
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,3 @@ spec/spec_helper.rb:
3535
unmanaged: false
3636
.travis.yml:
3737
delete: true
38-
Rakefile:
39-
extra_disabled_lint_checks:
40-
- parameter_types
41-
- legacy_facts
42-
- top_scope_facts
43-
- parameter_documentation
44-
- topscope_variable

‎Rakefile

-5
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ def changelog_future_release
4242
end
4343

4444
PuppetLint.configuration.send('disable_relative')
45-
PuppetLint.configuration.send('disable_parameter_types')
46-
PuppetLint.configuration.send('disable_legacy_facts')
47-
PuppetLint.configuration.send('disable_top_scope_facts')
48-
PuppetLint.configuration.send('disable_parameter_documentation')
49-
PuppetLint.configuration.send('disable_topscope_variable')
5045

5146

5247
if Bundler.rubygems.find_name('github_changelog_generator').any?

‎manifests/compose.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
if $raw_url != undef {
6262
$docker_compose_url = $raw_url
6363
} else {
64-
$docker_compose_url = "${base_url}/${version}/docker-compose-${::kernel}-${facts['os']['hardware']}${file_extension}"
64+
$docker_compose_url = "${base_url}/${version}/docker-compose-${facts['kernel']}-${facts['os']['hardware']}${file_extension}"
6565
}
6666

6767
if $proxy != undef {

‎manifests/exec.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
$docker_command = $docker::params::docker_command
3030

3131
if $facts['os']['family'] == 'windows' {
32-
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
32+
$exec_environment = "PATH=${facts['docker_program_files_path']}/Docker/"
3333
$exec_timeout = 3000
34-
$exec_path = ["${::docker_program_files_path}/Docker/",]
34+
$exec_path = ["${facts['docker_program_files_path']}/Docker/",]
3535
$exec_provider = 'powershell'
3636
} else {
3737
$exec_environment = 'HOME=/root'

‎manifests/image.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141

4242
if $facts['os']['family'] == 'windows' {
4343
$update_docker_image_template = 'docker/windows/update_docker_image.ps1.erb'
44-
$update_docker_image_path = "${::docker_user_temp_path}/update_docker_image.ps1"
45-
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
44+
$update_docker_image_path = "${facts['docker_user_temp_path']}/update_docker_image.ps1"
45+
$exec_environment = "PATH=${facts['docker_program_files_path']}/Docker/"
4646
$exec_timeout = 3000
4747
$update_docker_image_owner = undef
48-
$exec_path = ["${::docker_program_files_path}/Docker/",]
48+
$exec_path = ["${facts['docker_program_files_path']}/Docker/",]
4949
$exec_provider = 'powershell'
5050
} else {
5151
$update_docker_image_template = 'docker/update_docker_image.sh.erb'

‎manifests/images.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# @param images
44
#
55
class docker::images (
6-
$images
6+
Hash $images
77
) {
88
create_resources(docker::image, $images)
99
}

‎manifests/init.pp

+1
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@
347347
# @param service_hasstatus
348348
# @param service_hasrestart
349349
# @param acknowledge_unsupported_os
350+
# @param have_systemd_v230
350351
#
351352
class docker (
352353
Optional[String] $version = $docker::params::version,

‎manifests/install.pp

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
# @param dependent_packages
2020
#
2121
class docker::install (
22-
$version = $docker::version,
23-
$nuget_package_provider_version = $docker::nuget_package_provider_version,
24-
$docker_msft_provider_version = $docker::docker_msft_provider_version,
25-
$docker_ee_package_name = $docker::docker_ee_package_name,
26-
$docker_download_url = $docker::package_location,
27-
$dependent_packages = $docker::dependent_packages,
22+
Optional[String] $version = $docker::version,
23+
Optional[String] $nuget_package_provider_version = $docker::nuget_package_provider_version,
24+
Optional[String] $docker_msft_provider_version = $docker::docker_msft_provider_version,
25+
Optional[String] $docker_ee_package_name = $docker::docker_ee_package_name,
26+
Optional[String] $docker_download_url = $docker::package_location,
27+
Array $dependent_packages = $docker::dependent_packages,
2828
) {
2929
$docker_start_command = $docker::docker_start_command
3030

‎manifests/machine.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
if $ensure == 'present' {
4747
$docker_machine_url = $url ? {
48-
undef => "https://github.com/docker/machine/releases/download/v${version}/docker-machine-${::kernel}-x86_64${file_extension}",
48+
undef => "https://github.com/docker/machine/releases/download/v${version}/docker-machine-${facts['kernel']}-x86_64${file_extension}",
4949
default => $url,
5050
}
5151

‎manifests/params.pp

+6-6
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@
9090
$docker_command = 'docker'
9191

9292
if ($facts['os']['family'] == 'windows') {
93-
$compose_install_path = "${::docker_program_files_path}/Docker"
93+
$compose_install_path = "${facts['docker_program_files_path']}/Docker"
9494
$compose_version = '1.29.2'
9595
$docker_ee_package_name = 'Docker'
96-
$machine_install_path = "${::docker_program_files_path}/Docker"
97-
$tls_cacert = "${::docker_program_data_path}/docker/certs.d/ca.pem"
98-
$tls_cert = "${::docker_program_data_path}/docker/certs.d/server-cert.pem"
99-
$tls_key = "${::docker_program_data_path}/docker/certs.d/server-key.pem"
96+
$machine_install_path = "${facts['docker_program_files_path']}/Docker"
97+
$tls_cacert = "${facts['docker_program_data_path']}/docker/certs.d/ca.pem"
98+
$tls_cert = "${facts['docker_program_data_path']}/docker/certs.d/server-cert.pem"
99+
$tls_key = "${facts['docker_program_data_path']}/docker/certs.d/server-key.pem"
100100
} else {
101101
$compose_install_path = '/usr/local/bin'
102102
$compose_version = '1.29.2'
@@ -243,7 +243,7 @@
243243
$msft_provider_version = $docker_msft_provider_version
244244
$msft_package_version = $version
245245
$service_config_template = 'docker/windows/config/daemon.json.erb'
246-
$service_config = "${::docker_program_data_path}/docker/config/daemon.json"
246+
$service_config = "${facts['docker_program_data_path']}/docker/config/daemon.json"
247247
$docker_group = 'docker'
248248
$package_ce_source_location = undef
249249
$package_ce_key_source = undef

‎manifests/plugin.pp

-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
# Note that the default behaviour of docker plugin
77
# requires a plugin be disabled before it can be removed
88
#
9-
# @param plugin_name
10-
# The name of the docker plugin
11-
#
129
# @param enabled
1310
# A setting to enable or disable an installed plugin.
1411
#
@@ -35,8 +32,6 @@
3532
#
3633
# @param ensure
3734
#
38-
# @param grant_all_permissions
39-
#
4035
define docker::plugin (
4136
Enum[present,absent] $ensure = 'present',
4237
String $plugin_name = $title,

‎manifests/plugins.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# @param plugins
44
#
55
class docker::plugins (
6-
$plugins
6+
Hash $plugins
77
) {
88
create_resources(docker::plugin, $plugins)
99
}

‎manifests/registry.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
$docker_command = $docker::params::docker_command
5252

5353
if $facts['os']['family'] == 'windows' {
54-
$exec_environment = ["PATH=${::docker_program_files_path}/Docker/",]
54+
$exec_environment = ["PATH=${facts['docker_program_files_path']}/Docker/",]
5555
$exec_timeout = 3000
56-
$exec_path = ["${::docker_program_files_path}/Docker/",]
56+
$exec_path = ["${facts['docker_program_files_path']}/Docker/",]
5757
$exec_provider = 'powershell'
5858
$password_env = '$env:password'
5959
$exec_user = undef
@@ -124,7 +124,7 @@
124124
} else {
125125
# server may be an URI, which can contain /
126126
$server_strip = regsubst($server, '[/:]', '_', 'G')
127-
$passfile = "${::docker_user_temp_path}/registry-auth-puppet_receipt_${server_strip}_${local_user}"
127+
$passfile = "${facts['docker_user_temp_path']}/registry-auth-puppet_receipt_${server_strip}_${local_user}"
128128
$_auth_command = "if (-not (${auth_cmd})) { Remove-Item -Path ${passfile} -Force -Recurse -EA SilentlyContinue; exit 1 } else { exit 0 }" # lint:ignore:140chars
129129

130130
if $ensure == 'absent' {

‎manifests/registry_auth.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# @param registries
44
#
55
class docker::registry_auth (
6-
$registries
6+
Hash $registries
77
) {
88
create_resources(docker::registry, $registries)
99
}

‎manifests/repos.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
# @param architecture
1010
#
1111
class docker::repos (
12-
$location = $docker::package_location,
13-
$key_source = $docker::package_key_source,
14-
$key_check_source = $docker::package_key_check_source,
15-
$architecture = $facts['os']['architecture'],
12+
Optional[String] $location = $docker::package_location,
13+
Optional[String] $key_source = $docker::package_key_source,
14+
Optional[Boolean] $key_check_source = $docker::package_key_check_source,
15+
String $architecture = $facts['os']['architecture'],
1616
) {
1717
ensure_packages($docker::prerequired_packages)
1818

‎manifests/run.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,11 @@
355355
}
356356

357357
if $facts['os']['family'] == 'windows' {
358-
$exec_environment = "PATH=${::docker_program_files_path}/Docker/;${::docker_systemroot}/System32/"
358+
$exec_environment = "PATH=${facts['docker_program_files_path']}/Docker/;${facts['docker_systemroot']}/System32/"
359359
$exec_timeout = 3000
360-
$exec_path = ["${::docker_program_files_path}/Docker/"]
360+
$exec_path = ["${facts['docker_program_files_path']}/Docker/"]
361361
$exec_provider = 'powershell'
362-
$cidfile = "${::docker_user_temp_path}/${service_prefix}${sanitised_title}.cid"
362+
$cidfile = "${facts['docker_user_temp_path']}/${service_prefix}${sanitised_title}.cid"
363363
$restart_check = "${docker_command} inspect ${sanitised_title} -f '{{ if eq \\\"unhealthy\\\" .State.Health.Status }} {{ .Name }}{{ end }}' | findstr ${sanitised_title}" # lint:ignore:140chars
364364
$container_running_check = "\$state = ${docker_command} inspect ${sanitised_title} -f \"{{ .State.Running }}\"; if (\$state -ieq \"true\") { Exit 0 } else { Exit 1 }" # lint:ignore:140chars
365365
} else {
@@ -505,7 +505,7 @@
505505
fail('Restart parameter is required for Windows')
506506
}
507507

508-
$hasstatus = $::docker::params::service_hasstatus
508+
$hasstatus = $docker::params::service_hasstatus
509509
}
510510
}
511511

‎manifests/run_instance.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# @param instance
44
#
55
class docker::run_instance (
6-
$instance
6+
Hash $instance
77
) {
88
create_resources(docker::run, $instance)
99
}

0 commit comments

Comments
 (0)