Skip to content

Commit 5d7b9d4

Browse files
chelnakchelnak
authored
Merge pull request #837 from puppetlabs/GH-803_avoid_empty_array_to_net_parameter
2 parents 9ed030c + 6968395 commit 5d7b9d4

File tree

1 file changed

+62
-62
lines changed

1 file changed

+62
-62
lines changed

‎manifests/run.pp‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -192,68 +192,68 @@
192192
# @param read_only
193193
#
194194
define docker::run (
195-
Optional[Pattern[/^[\S]*$/]] $image = undef,
196-
Enum[present,absent] $ensure = 'present',
197-
Optional[String] $verify_digest = undef,
198-
Optional[String] $command = undef,
199-
Pattern[/^[\d]*(b|k|m|g)$/] $memory_limit = '0b',
200-
Variant[String,Array,Undef] $cpuset = [],
201-
Variant[String,Array,Undef] $ports = [],
202-
Variant[String,Array,Undef] $labels = [],
203-
Variant[String,Array,Undef] $expose = [],
204-
Variant[String,Array,Undef] $volumes = [],
205-
Variant[String,Array,Undef] $links = [],
206-
Boolean $use_name = false,
207-
Boolean $running = true,
208-
Variant[String,Array] $volumes_from = [],
209-
Variant[String,Array,Undef] $net = undef,
210-
Variant[String,Boolean] $username = false,
211-
Variant[String,Boolean] $hostname = false,
212-
Variant[String,Array] $env = [],
213-
Variant[String,Array] $env_file = [],
214-
Variant[String,Array] $dns = [],
215-
Variant[String,Array] $dns_search = [],
216-
Variant[String,Array] $lxc_conf = [],
217-
String $service_prefix = 'docker-',
218-
Optional[String] $service_provider = undef,
219-
Boolean $restart_service = true,
220-
Boolean $restart_service_on_docker_refresh = true,
221-
Boolean $manage_service = true,
222-
Variant[String,Boolean] $docker_service = false,
223-
Boolean $disable_network = false,
224-
Boolean $privileged = false,
225-
Optional[Boolean] $detach = undef,
226-
Optional[Variant[String,Array[String]]] $extra_parameters = undef,
227-
String $systemd_restart = 'on-failure',
228-
Variant[String,Hash] $extra_systemd_parameters = {},
229-
Boolean $pull_on_start = false,
230-
Variant[String,Array] $after = [],
231-
Variant[String,Array] $after_service = [],
232-
Variant[String,Array] $depends = [],
233-
Variant[String,Array] $depend_services = ['docker.service'],
234-
Boolean $tty = false,
235-
Variant[String,Array] $socket_connect = [],
236-
Variant[String,Array] $hostentries = [],
237-
Optional[String] $restart = undef,
238-
Variant[String,Boolean] $before_start = false,
239-
Variant[String,Boolean] $before_stop = false,
240-
Variant[String,Boolean] $after_start = false,
241-
Variant[String,Boolean] $after_stop = false,
242-
Optional[String] $after_create = undef,
243-
Boolean $remove_container_on_start = true,
244-
Boolean $remove_container_on_stop = true,
245-
Boolean $remove_volume_on_start = false,
246-
Boolean $remove_volume_on_stop = false,
247-
Integer $stop_wait_time = 0,
248-
Optional[String] $syslog_identifier = undef,
249-
Optional[String] $syslog_facility = undef,
250-
Boolean $read_only = false,
251-
Optional[String] $health_check_cmd = undef,
252-
Boolean $restart_on_unhealthy = false,
253-
Optional[Integer] $health_check_interval = undef,
254-
Variant[String,Array] $custom_unless = [],
255-
Optional[String] $remain_after_exit = undef,
256-
Boolean $prepare_service_only = false,
195+
Optional[Pattern[/^[\S]*$/]] $image = undef,
196+
Enum[present,absent] $ensure = 'present',
197+
Optional[String] $verify_digest = undef,
198+
Optional[String] $command = undef,
199+
Pattern[/^[\d]*(b|k|m|g)$/] $memory_limit = '0b',
200+
Variant[String,Array,Undef] $cpuset = [],
201+
Variant[String,Array,Undef] $ports = [],
202+
Variant[String,Array,Undef] $labels = [],
203+
Variant[String,Array,Undef] $expose = [],
204+
Variant[String,Array,Undef] $volumes = [],
205+
Variant[String,Array,Undef] $links = [],
206+
Boolean $use_name = false,
207+
Boolean $running = true,
208+
Variant[String,Array] $volumes_from = [],
209+
Variant[String,Array[String[1],1],Undef] $net = undef,
210+
Variant[String,Boolean] $username = false,
211+
Variant[String,Boolean] $hostname = false,
212+
Variant[String,Array] $env = [],
213+
Variant[String,Array] $env_file = [],
214+
Variant[String,Array] $dns = [],
215+
Variant[String,Array] $dns_search = [],
216+
Variant[String,Array] $lxc_conf = [],
217+
String $service_prefix = 'docker-',
218+
Optional[String] $service_provider = undef,
219+
Boolean $restart_service = true,
220+
Boolean $restart_service_on_docker_refresh = true,
221+
Boolean $manage_service = true,
222+
Variant[String,Boolean] $docker_service = false,
223+
Boolean $disable_network = false,
224+
Boolean $privileged = false,
225+
Optional[Boolean] $detach = undef,
226+
Optional[Variant[String,Array[String]]] $extra_parameters = undef,
227+
String $systemd_restart = 'on-failure',
228+
Variant[String,Hash] $extra_systemd_parameters = {},
229+
Boolean $pull_on_start = false,
230+
Variant[String,Array] $after = [],
231+
Variant[String,Array] $after_service = [],
232+
Variant[String,Array] $depends = [],
233+
Variant[String,Array] $depend_services = ['docker.service'],
234+
Boolean $tty = false,
235+
Variant[String,Array] $socket_connect = [],
236+
Variant[String,Array] $hostentries = [],
237+
Optional[String] $restart = undef,
238+
Variant[String,Boolean] $before_start = false,
239+
Variant[String,Boolean] $before_stop = false,
240+
Variant[String,Boolean] $after_start = false,
241+
Variant[String,Boolean] $after_stop = false,
242+
Optional[String] $after_create = undef,
243+
Boolean $remove_container_on_start = true,
244+
Boolean $remove_container_on_stop = true,
245+
Boolean $remove_volume_on_start = false,
246+
Boolean $remove_volume_on_stop = false,
247+
Integer $stop_wait_time = 0,
248+
Optional[String] $syslog_identifier = undef,
249+
Optional[String] $syslog_facility = undef,
250+
Boolean $read_only = false,
251+
Optional[String] $health_check_cmd = undef,
252+
Boolean $restart_on_unhealthy = false,
253+
Optional[Integer] $health_check_interval = undef,
254+
Variant[String,Array] $custom_unless = [],
255+
Optional[String] $remain_after_exit = undef,
256+
Boolean $prepare_service_only = false,
257257
) {
258258
include docker::params
259259

0 commit comments

Comments
 (0)