Skip to content

Commit a61afc2

Browse files
Ramesh7Ramesh7
authored
Merge pull request #944 from puppetlabs/CAT-1143-erb_to_epp_docker
(CAT-1143)-Conversion_of_erb_templates_to_epp
2 parents efe8f3c + 3e101cb commit a61afc2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+778
-584
lines changed

‎manifests/compose.pp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,14 @@
6969
if $facts['os']['family'] == 'windows' {
7070
$docker_download_command = "if (Invoke-WebRequest ${docker_compose_url} ${proxy_opt} -UseBasicParsing -OutFile \"${docker_compose_location_versioned}\") { exit 0 } else { exit 1}" # lint:ignore:140chars
7171

72+
$parameters = {
73+
'proxy' => $proxy,
74+
'docker_compose_url' => $docker_compose_url,
75+
'docker_compose_location_versioned' => $docker_compose_location_versioned,
76+
}
77+
7278
exec { "Install Docker Compose ${version}":
73-
command => template('docker/windows/download_docker_compose.ps1.erb'),
79+
command => epp('docker/windows/download_docker_compose.ps1.epp', $parameters),
7480
provider => powershell,
7581
creates => $docker_compose_location_versioned,
7682
}

‎manifests/image.pp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
$docker_command = $docker::params::docker_command
4141

4242
if $facts['os']['family'] == 'windows' {
43-
$update_docker_image_template = 'docker/windows/update_docker_image.ps1.erb'
43+
$update_docker_image_template = 'docker/windows/update_docker_image.ps1.epp'
4444
$update_docker_image_path = "${facts['docker_user_temp_path']}/update_docker_image.ps1"
4545
$exec_environment = "PATH=${facts['docker_program_files_path']}/Docker/"
4646
$exec_timeout = 3000
4747
$update_docker_image_owner = undef
4848
$exec_path = ["${facts['docker_program_files_path']}/Docker/",]
4949
$exec_provider = 'powershell'
5050
} else {
51-
$update_docker_image_template = 'docker/update_docker_image.sh.erb'
51+
$update_docker_image_template = 'docker/update_docker_image.sh.epp'
5252
$update_docker_image_path = '/usr/local/bin/update_docker_image.sh'
5353
$update_docker_image_owner = 'root'
5454
$exec_environment = 'HOME=/root'
@@ -57,14 +57,17 @@
5757
$exec_provider = undef
5858
}
5959

60+
$parameters = {
61+
'docker_command' => $docker_command,
62+
}
6063
# Wrapper used to ensure images are up to date
6164
ensure_resource('file', $update_docker_image_path,
6265
{
6366
ensure => $docker::params::ensure,
6467
owner => $update_docker_image_owner,
6568
group => $update_docker_image_owner,
6669
mode => '0555',
67-
content => template($update_docker_image_template),
70+
content => epp($update_docker_image_template, $parameters),
6871
}
6972
)
7073

‎manifests/install.pp

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,26 +88,52 @@
8888
}
8989
} else {
9090
if $ensure == 'absent' {
91+
$remove_docker_parameters = {
92+
'docker_ee_package_name' => $docker_ee_package_name,
93+
'version' => $version,
94+
}
95+
$check_docker_parameters = {
96+
'docker_ee_package_name' => $docker_ee_package_name,
97+
}
9198
exec { 'remove-docker-package':
92-
command => template('docker/windows/remove_docker.ps1.erb'),
99+
command => epp('docker/windows/remove_docker.ps1.epp', $remove_docker_parameters),
93100
provider => powershell,
94-
unless => template('docker/windows/check_docker.ps1.erb'),
101+
unless => epp('docker/windows/check_docker.ps1.epp', $check_docker_parameters),
95102
logoutput => true,
96103
}
97104
} else {
98105
if $docker::package_location {
106+
$download_docker_parameters = {
107+
'docker_download_url' => $docker_download_url,
108+
}
109+
$check_docker_url_parameters = {
110+
'docker_download_url' => $docker_download_url,
111+
}
99112
exec { 'install-docker-package':
100-
command => template('docker/windows/download_docker.ps1.erb'),
113+
command => epp('docker/windows/download_docker.ps1.epp', $download_docker_parameters),
101114
provider => powershell,
102-
unless => template('docker/windows/check_docker_url.ps1.erb'),
115+
unless => epp('docker/windows/check_docker_url.ps1.epp', $check_docker_url_parameters),
103116
logoutput => true,
104117
notify => Exec['service-restart-on-failure'],
105118
}
106119
} else {
120+
$install_powershell_provider_parameters = {
121+
'nuget_package_provider_version' => $nuget_package_provider_version,
122+
'docker_msft_provider_version' => $docker_msft_provider_version,
123+
'version' => $version,
124+
}
125+
126+
$check_powershell_provider_parameters = {
127+
'nuget_package_provider_version' => $nuget_package_provider_version,
128+
'docker_msft_provider_version' => $docker_msft_provider_version,
129+
'docker_ee_package_name' => $docker_ee_package_name,
130+
'version' => $version,
131+
}
132+
107133
exec { 'install-docker-package':
108-
command => template('docker/windows/install_powershell_provider.ps1.erb'),
134+
command => epp('docker/windows/install_powershell_provider.ps1.epp', $install_powershell_provider_parameters),
109135
provider => powershell,
110-
unless => template('docker/windows/check_powershell_provider.ps1.erb'),
136+
unless => epp('docker/windows/check_powershell_provider.ps1.epp', $check_powershell_provider_parameters),
111137
logoutput => true,
112138
timeout => 1800,
113139
notify => Exec['service-restart-on-failure'],

‎manifests/machine.pp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,14 @@
5454
if $facts['os']['family'] == 'windows' {
5555
$docker_download_command = "if (Invoke-WebRequest ${docker_machine_url} ${proxy_opt} -UseBasicParsing -OutFile \"${docker_machine_location_versioned}\") { exit 0 } else { exit 1}" # lint:ignore:140chars
5656

57+
$parameters = {
58+
'proxy' => $proxy,
59+
'docker_machine_url' => $docker_machine_url,
60+
'docker_machine_location_versioned' => $docker_machine_location_versioned,
61+
}
62+
5763
exec { "Install Docker Machine ${version}":
58-
command => template('docker/windows/download_docker_machine.ps1.erb'),
64+
command => epp('docker/windows/download_docker_machine.ps1.epp', $parameters),
5965
provider => powershell,
6066
creates => $docker_machine_location_versioned,
6167
}

‎manifests/params.pp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
$storage_auto_extend_pool = undef
8282
$storage_pool_autoextend_threshold = undef
8383
$storage_pool_autoextend_percent = undef
84-
$storage_config_template = 'docker/etc/sysconfig/docker-storage.erb'
84+
$storage_config_template = 'docker/etc/sysconfig/docker-storage.epp'
8585
$registry_mirror = undef
8686
$curl_ensure = true
8787
$os_lc = downcase($facts['os']['name'])
@@ -115,17 +115,17 @@
115115

116116
if (versioncmp($facts['os']['release']['full'], '15.04') >= 0) {
117117
$service_after_override = undef
118-
$service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
118+
$service_config_template = 'docker/etc/sysconfig/docker.systemd.epp'
119119
$service_hasrestart = true
120120
$service_hasstatus = true
121-
$service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb'
121+
$service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.epp'
122122
$service_provider = 'systemd'
123123
$socket_override = false
124-
$socket_overrides_template = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb'
124+
$socket_overrides_template = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.epp'
125125
$storage_config = '/etc/default/docker-storage'
126126
include docker::systemd_reload
127127
} else {
128-
$service_config_template = 'docker/etc/default/docker.erb'
128+
$service_config_template = 'docker/etc/default/docker.epp'
129129
$service_overrides_template = undef
130130
$socket_overrides_template = undef
131131
$socket_override = false
@@ -144,9 +144,9 @@
144144
}
145145
$service_provider = 'systemd'
146146
$storage_config = '/etc/default/docker-storage'
147-
$service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
148-
$service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb'
149-
$socket_overrides_template = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb'
147+
$service_config_template = 'docker/etc/sysconfig/docker.systemd.epp'
148+
$service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.epp'
149+
$socket_overrides_template = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.epp'
150150
$socket_override = false
151151
$service_after_override = undef
152152
$service_hasstatus = true
@@ -198,13 +198,13 @@
198198
'RedHat' : {
199199
$service_after_override = undef
200200
$service_config = '/etc/sysconfig/docker'
201-
$service_config_template = 'docker/etc/sysconfig/docker.systemd.erb'
201+
$service_config_template = 'docker/etc/sysconfig/docker.systemd.epp'
202202
$service_hasrestart = true
203203
$service_hasstatus = true
204-
$service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.erb'
204+
$service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.epp'
205205
$service_provider = 'systemd'
206206
$socket_override = false
207-
$socket_overrides_template = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.erb'
207+
$socket_overrides_template = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.epp'
208208
$storage_config = '/etc/sysconfig/docker-storage'
209209
$storage_setup_file = '/etc/sysconfig/docker-storage-setup'
210210
$use_upstream_package_source = true
@@ -242,7 +242,7 @@
242242
$msft_nuget_package_provider_version = $nuget_package_provider_version
243243
$msft_provider_version = $docker_msft_provider_version
244244
$msft_package_version = $version
245-
$service_config_template = 'docker/windows/config/daemon.json.erb'
245+
$service_config_template = 'docker/windows/config/daemon.json.epp'
246246
$service_config = "${facts['docker_program_data_path']}/docker/config/daemon.json"
247247
$docker_group = 'docker'
248248
$package_ce_source_location = undef

‎manifests/run.pp

Lines changed: 62 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -475,22 +475,50 @@
475475
}
476476
}
477477
} else {
478-
$docker_run_inline_start = template('docker/docker-run-start.erb')
479-
$docker_run_inline_stop = template('docker/docker-run-stop.erb')
478+
$run_start_parameters = {
479+
'before_start' => $before_start,
480+
'remove_container_on_start' => $remove_container_on_start,
481+
'docker_command' => $docker_command,
482+
'remove_volume_on_start' => $remove_volume_on_start,
483+
'sanitised_title' => $sanitised_title,
484+
'pull_on_start' => $pull_on_start,
485+
'image' => $image,
486+
'verify_digest' => $verify_digest,
487+
'docker_run_flags' => $docker_run_flags,
488+
'command' => $command,
489+
'after_create' => $after_create,
490+
'net' => $net,
491+
'valid_detach' => $valid_detach,
492+
'after_start' => $after_start,
493+
}
494+
495+
$docker_run_inline_start = epp('docker/docker-run-start.epp', $run_start_parameters)
496+
497+
$run_stop_parameters = {
498+
'before_stop' => $before_stop,
499+
'docker_command' => $docker_command,
500+
'stop_wait_time' => $stop_wait_time,
501+
'sanitised_title' => $sanitised_title,
502+
'remove_container_on_stop' => $remove_container_on_stop,
503+
'remove_volume_on_stop' => $remove_volume_on_stop,
504+
'after_stop' => $after_stop,
505+
}
506+
507+
$docker_run_inline_stop = epp('docker/docker-run-stop.epp', $run_stop_parameters)
480508

481509
case $service_provider_real {
482510
'systemd': {
483511
$initscript = "/etc/systemd/system/${service_prefix}${sanitised_title}.service"
484512
$startscript = "/usr/local/bin/docker-run-${sanitised_title}-start.sh"
485513
$stopscript = "/usr/local/bin/docker-run-${sanitised_title}-stop.sh"
486514
$startstop_template = 'docker/usr/local/bin/docker-run.sh.epp'
487-
$init_template = 'docker/etc/systemd/system/docker-run.erb'
515+
$init_template = 'docker/etc/systemd/system/docker-run.epp'
488516
$mode = '0644'
489517
$hasstatus = true
490518
}
491519
'upstart': {
492520
$initscript = "/etc/init.d/${service_prefix}${sanitised_title}"
493-
$init_template = 'docker/etc/init.d/docker-run.erb'
521+
$init_template = 'docker/etc/init.d/docker-run.epp'
494522
$mode = '0750'
495523
$startscript = undef
496524
$stopscript = undef
@@ -589,9 +617,38 @@
589617
}
590618
}
591619

620+
if $service_provider_real == 'systemd' {
621+
$init_template_parameters = {
622+
'depend_services_array' => $depend_services_array,
623+
'sanitised_after_array' => $sanitised_after_array,
624+
'service_prefix' => $service_prefix,
625+
'sanitised_depends_array' => $sanitised_depends_array,
626+
'title' => $title,
627+
'have_systemd_v230' => $docker::params::have_systemd_v230,
628+
'extra_systemd_parameters' => $extra_systemd_parameters,
629+
'systemd_restart' => $systemd_restart,
630+
'_syslog_identifier' => $_syslog_identifier,
631+
'syslog_facility' => $syslog_facility,
632+
'sanitised_title' => $sanitised_title,
633+
'remain_after_exit' => $remain_after_exit,
634+
'service_name' => $service_name,
635+
}
636+
} elsif $service_provider_real == 'upstart' {
637+
$init_template_parameters = {
638+
'sanitised_after_array' => $sanitised_after_array,
639+
'service_prefix' => $service_prefix,
640+
'sanitised_depends_array' => $sanitised_depends_array,
641+
'depend_services_array' => $depend_services_array,
642+
'docker_command' => $docker_command,
643+
'sanitised_title' => $sanitised_title,
644+
'docker_run_inline_start' => $docker_run_inline_start,
645+
'docker_run_inline_stop' => $docker_run_inline_stop,
646+
}
647+
}
648+
592649
file { $initscript:
593650
ensure => file,
594-
content => template($init_template),
651+
content => epp($init_template, $init_template_parameters),
595652
seltype => 'container_unit_file_t',
596653
owner => 'root',
597654
group => $docker_group,

0 commit comments

Comments
 (0)