diff --git a/manifests/init.pp b/manifests/init.pp index ac10e1be..95ef9aa6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -348,131 +348,135 @@ # @param service_hasrestart # @param acknowledge_unsupported_os # @param have_systemd_v230 +# @param run_systemd_start_limit_interval_sec +# @param run_systemd_start_limit_burst # class docker ( - Optional[String] $version = $docker::params::version, - String $ensure = $docker::params::ensure, - Variant[Array[String], Hash] $prerequired_packages = $docker::params::prerequired_packages, - Array $dependent_packages = $docker::params::dependent_packages, - String $docker_ce_start_command = $docker::params::docker_ce_start_command, - Optional[String] $docker_ce_package_name = $docker::params::docker_ce_package_name, - String[1] $docker_ce_cli_package_name = $docker::params::docker_ce_cli_package_name, - Optional[String] $docker_ce_source_location = $docker::params::package_ce_source_location, - Optional[String] $docker_ce_key_source = $docker::params::package_ce_key_source, - Optional[String] $docker_ce_key_id = $docker::params::package_ce_key_id, - Optional[String] $docker_ce_release = $docker::params::package_ce_release, - Optional[String] $docker_package_location = $docker::params::package_source_location, - Optional[String] $docker_package_key_source = $docker::params::package_key_source, - Optional[Boolean] $docker_package_key_check_source = $docker::params::package_key_check_source, - Optional[String] $docker_package_key_id = $docker::params::package_key_id, - Optional[String] $docker_package_release = $docker::params::package_release, - String $docker_engine_start_command = $docker::params::docker_engine_start_command, - String $docker_engine_package_name = $docker::params::docker_engine_package_name, - String $docker_ce_channel = $docker::params::docker_ce_channel, - Optional[Boolean] $docker_ee = $docker::params::docker_ee, - Optional[String] $docker_ee_package_name = $docker::params::package_ee_package_name, - Optional[String] $docker_ee_source_location = $docker::params::package_ee_source_location, - Optional[String] $docker_ee_key_source = $docker::params::package_ee_key_source, - Optional[String] $docker_ee_key_id = $docker::params::package_ee_key_id, - Optional[String] $docker_ee_repos = $docker::params::package_ee_repos, - Optional[String] $docker_ee_release = $docker::params::package_ee_release, - Optional[Variant[String,Array[String]]] $tcp_bind = $docker::params::tcp_bind, - Boolean $tls_enable = $docker::params::tls_enable, - Boolean $tls_verify = $docker::params::tls_verify, - Optional[String] $tls_cacert = $docker::params::tls_cacert, - Optional[String] $tls_cert = $docker::params::tls_cert, - Optional[String] $tls_key = $docker::params::tls_key, - Boolean $ip_forward = $docker::params::ip_forward, - Boolean $ip_masq = $docker::params::ip_masq, - Optional[Boolean] $ipv6 = $docker::params::ipv6, - Optional[String] $ipv6_cidr = $docker::params::ipv6_cidr, - Optional[String] $default_gateway_ipv6 = $docker::params::default_gateway_ipv6, - Optional[String] $bip = $docker::params::bip, - Optional[String] $mtu = $docker::params::mtu, - Boolean $iptables = $docker::params::iptables, - Optional[Boolean] $icc = $docker::params::icc, - String $socket_bind = $docker::params::socket_bind, - Optional[String] $fixed_cidr = $docker::params::fixed_cidr, - Optional[String] $bridge = $docker::params::bridge, - Optional[String] $default_gateway = $docker::params::default_gateway, - Optional[String] $log_level = $docker::params::log_level, - Optional[String] $log_driver = $docker::params::log_driver, - Array $log_opt = $docker::params::log_opt, - Optional[Boolean] $selinux_enabled = $docker::params::selinux_enabled, - Optional[Boolean] $use_upstream_package_source = $docker::params::use_upstream_package_source, - Optional[Boolean] $pin_upstream_package_source = $docker::params::pin_upstream_package_source, - Optional[Integer] $apt_source_pin_level = $docker::params::apt_source_pin_level, - Optional[String] $package_release = $docker::params::package_release, - String $service_state = $docker::params::service_state, - Boolean $service_enable = $docker::params::service_enable, - Boolean $manage_service = $docker::params::manage_service, - Optional[String] $root_dir = $docker::params::root_dir, - Optional[Boolean] $tmp_dir_config = $docker::params::tmp_dir_config, - Optional[String] $tmp_dir = $docker::params::tmp_dir, - Optional[Variant[String,Array]] $dns = $docker::params::dns, - Optional[Variant[String,Array]] $dns_search = $docker::params::dns_search, - Optional[Variant[String,Boolean]] $socket_group = $docker::params::socket_group, - Array $labels = $docker::params::labels, - Optional[Variant[String,Array]] $extra_parameters = undef, - Optional[Variant[String,Array]] $shell_values = undef, - Optional[String] $proxy = $docker::params::proxy, - Optional[String] $no_proxy = $docker::params::no_proxy, - Optional[String] $storage_driver = $docker::params::storage_driver, - Optional[String] $dm_basesize = $docker::params::dm_basesize, - Optional[String] $dm_fs = $docker::params::dm_fs, - Optional[String] $dm_mkfsarg = $docker::params::dm_mkfsarg, - Optional[String] $dm_mountopt = $docker::params::dm_mountopt, - Optional[String] $dm_blocksize = $docker::params::dm_blocksize, - Optional[String] $dm_loopdatasize = $docker::params::dm_loopdatasize, - Optional[String] $dm_loopmetadatasize = $docker::params::dm_loopmetadatasize, - Optional[String] $dm_datadev = $docker::params::dm_datadev, - Optional[String] $dm_metadatadev = $docker::params::dm_metadatadev, - Optional[String] $dm_thinpooldev = $docker::params::dm_thinpooldev, - Optional[Boolean] $dm_use_deferred_removal = $docker::params::dm_use_deferred_removal, - Optional[Boolean] $dm_use_deferred_deletion = $docker::params::dm_use_deferred_deletion, - Optional[Boolean] $dm_blkdiscard = $docker::params::dm_blkdiscard, - Optional[Boolean] $dm_override_udev_sync_check = $docker::params::dm_override_udev_sync_check, - Boolean $overlay2_override_kernel_check = $docker::params::overlay2_override_kernel_check, - Optional[String] $execdriver = $docker::params::execdriver, - Boolean $manage_package = $docker::params::manage_package, - Optional[String] $package_source = $docker::params::package_source, - Optional[String] $service_name = $docker::params::service_name, - Array $docker_users = [], - Boolean $create_user = true, - String $docker_group = $docker::params::docker_group, - Array $daemon_environment_files = [], - Optional[Variant[String,Hash]] $repo_opt = $docker::params::repo_opt, - Optional[String] $os_lc = $docker::params::os_lc, - Optional[String] $storage_devs = $docker::params::storage_devs, - Optional[String] $storage_vg = $docker::params::storage_vg, - Optional[String] $storage_root_size = $docker::params::storage_root_size, - Optional[String] $storage_data_size = $docker::params::storage_data_size, - Optional[String] $storage_min_data_size = $docker::params::storage_min_data_size, - Optional[String] $storage_chunk_size = $docker::params::storage_chunk_size, - Optional[Boolean] $storage_growpart = $docker::params::storage_growpart, - Optional[String] $storage_auto_extend_pool = $docker::params::storage_auto_extend_pool, - Optional[String] $storage_pool_autoextend_threshold = $docker::params::storage_pool_autoextend_threshold, - Optional[String] $storage_pool_autoextend_percent = $docker::params::storage_pool_autoextend_percent, - Optional[Variant[String,Boolean]] $storage_config = $docker::params::storage_config, - Optional[String] $storage_config_template = $docker::params::storage_config_template, - Optional[String] $storage_setup_file = $docker::params::storage_setup_file, - Optional[String] $service_provider = $docker::params::service_provider, - Optional[Variant[String,Boolean]] $service_config = $docker::params::service_config, - Optional[String] $service_config_template = $docker::params::service_config_template, - Optional[Variant[String,Boolean]] $service_overrides_template = $docker::params::service_overrides_template, - Optional[Variant[String,Boolean]] $socket_overrides_template = $docker::params::socket_overrides_template, - Optional[Boolean] $socket_override = $docker::params::socket_override, - Optional[Variant[String,Boolean]] $service_after_override = $docker::params::service_after_override, - Optional[Boolean] $service_hasstatus = $docker::params::service_hasstatus, - Optional[Boolean] $service_hasrestart = $docker::params::service_hasrestart, - Optional[Variant[String,Array]] $registry_mirror = $docker::params::registry_mirror, - Boolean $acknowledge_unsupported_os = false, + Optional[String] $version = $docker::params::version, + String $ensure = $docker::params::ensure, + Variant[Array[String], Hash] $prerequired_packages = $docker::params::prerequired_packages, + Array $dependent_packages = $docker::params::dependent_packages, + String $docker_ce_start_command = $docker::params::docker_ce_start_command, + Optional[String] $docker_ce_package_name = $docker::params::docker_ce_package_name, + String[1] $docker_ce_cli_package_name = $docker::params::docker_ce_cli_package_name, + Optional[String] $docker_ce_source_location = $docker::params::package_ce_source_location, + Optional[String] $docker_ce_key_source = $docker::params::package_ce_key_source, + Optional[String] $docker_ce_key_id = $docker::params::package_ce_key_id, + Optional[String] $docker_ce_release = $docker::params::package_ce_release, + Optional[String] $docker_package_location = $docker::params::package_source_location, + Optional[String] $docker_package_key_source = $docker::params::package_key_source, + Optional[Boolean] $docker_package_key_check_source = $docker::params::package_key_check_source, + Optional[String] $docker_package_key_id = $docker::params::package_key_id, + Optional[String] $docker_package_release = $docker::params::package_release, + String $docker_engine_start_command = $docker::params::docker_engine_start_command, + String $docker_engine_package_name = $docker::params::docker_engine_package_name, + String $docker_ce_channel = $docker::params::docker_ce_channel, + Optional[Boolean] $docker_ee = $docker::params::docker_ee, + Optional[String] $docker_ee_package_name = $docker::params::package_ee_package_name, + Optional[String] $docker_ee_source_location = $docker::params::package_ee_source_location, + Optional[String] $docker_ee_key_source = $docker::params::package_ee_key_source, + Optional[String] $docker_ee_key_id = $docker::params::package_ee_key_id, + Optional[String] $docker_ee_repos = $docker::params::package_ee_repos, + Optional[String] $docker_ee_release = $docker::params::package_ee_release, + Optional[Variant[String,Array[String]]] $tcp_bind = $docker::params::tcp_bind, + Boolean $tls_enable = $docker::params::tls_enable, + Boolean $tls_verify = $docker::params::tls_verify, + Optional[String] $tls_cacert = $docker::params::tls_cacert, + Optional[String] $tls_cert = $docker::params::tls_cert, + Optional[String] $tls_key = $docker::params::tls_key, + Boolean $ip_forward = $docker::params::ip_forward, + Boolean $ip_masq = $docker::params::ip_masq, + Optional[Boolean] $ipv6 = $docker::params::ipv6, + Optional[String] $ipv6_cidr = $docker::params::ipv6_cidr, + Optional[String] $default_gateway_ipv6 = $docker::params::default_gateway_ipv6, + Optional[String] $bip = $docker::params::bip, + Optional[String] $mtu = $docker::params::mtu, + Boolean $iptables = $docker::params::iptables, + Optional[Boolean] $icc = $docker::params::icc, + String $socket_bind = $docker::params::socket_bind, + Optional[String] $fixed_cidr = $docker::params::fixed_cidr, + Optional[String] $bridge = $docker::params::bridge, + Optional[String] $default_gateway = $docker::params::default_gateway, + Optional[String] $log_level = $docker::params::log_level, + Optional[String] $log_driver = $docker::params::log_driver, + Array $log_opt = $docker::params::log_opt, + Optional[Boolean] $selinux_enabled = $docker::params::selinux_enabled, + Optional[Boolean] $use_upstream_package_source = $docker::params::use_upstream_package_source, + Optional[Boolean] $pin_upstream_package_source = $docker::params::pin_upstream_package_source, + Optional[Integer] $apt_source_pin_level = $docker::params::apt_source_pin_level, + Optional[String] $package_release = $docker::params::package_release, + String $service_state = $docker::params::service_state, + Boolean $service_enable = $docker::params::service_enable, + Boolean $manage_service = $docker::params::manage_service, + Optional[String] $root_dir = $docker::params::root_dir, + Optional[Boolean] $tmp_dir_config = $docker::params::tmp_dir_config, + Optional[String] $tmp_dir = $docker::params::tmp_dir, + Optional[Variant[String,Array]] $dns = $docker::params::dns, + Optional[Variant[String,Array]] $dns_search = $docker::params::dns_search, + Optional[Variant[String,Boolean]] $socket_group = $docker::params::socket_group, + Array $labels = $docker::params::labels, + Optional[Variant[String,Array]] $extra_parameters = undef, + Optional[Variant[String,Array]] $shell_values = undef, + Optional[String] $proxy = $docker::params::proxy, + Optional[String] $no_proxy = $docker::params::no_proxy, + Optional[String] $storage_driver = $docker::params::storage_driver, + Optional[String] $dm_basesize = $docker::params::dm_basesize, + Optional[String] $dm_fs = $docker::params::dm_fs, + Optional[String] $dm_mkfsarg = $docker::params::dm_mkfsarg, + Optional[String] $dm_mountopt = $docker::params::dm_mountopt, + Optional[String] $dm_blocksize = $docker::params::dm_blocksize, + Optional[String] $dm_loopdatasize = $docker::params::dm_loopdatasize, + Optional[String] $dm_loopmetadatasize = $docker::params::dm_loopmetadatasize, + Optional[String] $dm_datadev = $docker::params::dm_datadev, + Optional[String] $dm_metadatadev = $docker::params::dm_metadatadev, + Optional[String] $dm_thinpooldev = $docker::params::dm_thinpooldev, + Optional[Boolean] $dm_use_deferred_removal = $docker::params::dm_use_deferred_removal, + Optional[Boolean] $dm_use_deferred_deletion = $docker::params::dm_use_deferred_deletion, + Optional[Boolean] $dm_blkdiscard = $docker::params::dm_blkdiscard, + Optional[Boolean] $dm_override_udev_sync_check = $docker::params::dm_override_udev_sync_check, + Boolean $overlay2_override_kernel_check = $docker::params::overlay2_override_kernel_check, + Optional[String] $execdriver = $docker::params::execdriver, + Boolean $manage_package = $docker::params::manage_package, + Optional[String] $package_source = $docker::params::package_source, + Optional[String] $service_name = $docker::params::service_name, + Array $docker_users = [], + Boolean $create_user = true, + String $docker_group = $docker::params::docker_group, + Array $daemon_environment_files = [], + Optional[Variant[String,Hash]] $repo_opt = $docker::params::repo_opt, + Optional[String] $os_lc = $docker::params::os_lc, + Optional[String] $storage_devs = $docker::params::storage_devs, + Optional[String] $storage_vg = $docker::params::storage_vg, + Optional[String] $storage_root_size = $docker::params::storage_root_size, + Optional[String] $storage_data_size = $docker::params::storage_data_size, + Optional[String] $storage_min_data_size = $docker::params::storage_min_data_size, + Optional[String] $storage_chunk_size = $docker::params::storage_chunk_size, + Optional[Boolean] $storage_growpart = $docker::params::storage_growpart, + Optional[String] $storage_auto_extend_pool = $docker::params::storage_auto_extend_pool, + Optional[String] $storage_pool_autoextend_threshold = $docker::params::storage_pool_autoextend_threshold, + Optional[String] $storage_pool_autoextend_percent = $docker::params::storage_pool_autoextend_percent, + Optional[Variant[String,Boolean]] $storage_config = $docker::params::storage_config, + Optional[String] $storage_config_template = $docker::params::storage_config_template, + Optional[String] $storage_setup_file = $docker::params::storage_setup_file, + Optional[String] $service_provider = $docker::params::service_provider, + Optional[Variant[String,Boolean]] $service_config = $docker::params::service_config, + Optional[String] $service_config_template = $docker::params::service_config_template, + Optional[Variant[String,Boolean]] $service_overrides_template = $docker::params::service_overrides_template, + Optional[Variant[String,Boolean]] $socket_overrides_template = $docker::params::socket_overrides_template, + Optional[Boolean] $socket_override = $docker::params::socket_override, + Optional[Variant[String,Boolean]] $service_after_override = $docker::params::service_after_override, + Optional[Boolean] $service_hasstatus = $docker::params::service_hasstatus, + Optional[Boolean] $service_hasrestart = $docker::params::service_hasrestart, + Optional[Variant[String,Array]] $registry_mirror = $docker::params::registry_mirror, + Boolean $acknowledge_unsupported_os = false, + Integer $run_systemd_start_limit_interval_sec = $docker::params::run_systemd_start_limit_interval_sec, + Integer $run_systemd_start_limit_burst = $docker::params::run_systemd_start_limit_burst, # Windows specific parameters - Optional[String] $docker_msft_provider_version = $docker::params::docker_msft_provider_version, - Optional[String] $nuget_package_provider_version = $docker::params::nuget_package_provider_version, + Optional[String] $docker_msft_provider_version = $docker::params::docker_msft_provider_version, + Optional[String] $nuget_package_provider_version = $docker::params::nuget_package_provider_version, - Boolean $have_systemd_v230 = $docker::params::have_systemd_v230, + Boolean $have_systemd_v230 = $docker::params::have_systemd_v230, ) inherits docker::params { if $facts['os']['family'] and ! $acknowledge_unsupported_os { assert_type(Pattern[/^(Debian|RedHat|windows)$/], $facts['os']['family']) |$a, $b| { diff --git a/manifests/params.pp b/manifests/params.pp index 940d2a5c..d3ce8708 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,92 +1,94 @@ # @summary Default parameter values for the docker module # class docker::params { - $version = undef - $ensure = present - $docker_ce_start_command = 'dockerd' - $docker_ce_package_name = 'docker-ce' - $docker_ce_cli_package_name = 'docker-ce-cli' - $docker_engine_start_command = 'docker daemon' - $docker_engine_package_name = 'docker-engine' - $docker_ce_channel = stable - $docker_ee = false - $docker_ee_start_command = 'dockerd' - $docker_ee_source_location = undef - $docker_ee_key_source = undef - $docker_ee_key_id = undef - $docker_ee_repos = stable - $tcp_bind = undef - $tls_enable = false - $tls_verify = true - $machine_version = '0.16.1' - $ip_forward = true - $iptables = true - $ipv6 = false - $ipv6_cidr = undef - $default_gateway_ipv6 = undef - $icc = undef - $ip_masq = true - $bip = undef - $mtu = undef - $fixed_cidr = undef - $bridge = undef - $default_gateway = undef - $socket_bind = 'unix:///var/run/docker.sock' - $log_level = undef - $log_driver = undef - $log_opt = [] - $selinux_enabled = undef - $socket_group_default = 'docker' - $labels = [] - $service_state = running - $service_enable = true - $manage_service = true - $root_dir = undef - $tmp_dir_config = true - $tmp_dir = '/tmp/' - $dns = undef - $dns_search = undef - $proxy = undef - $compose_version = undef - $no_proxy = undef - $execdriver = undef - $storage_driver = undef - $dm_basesize = undef - $dm_fs = undef - $dm_mkfsarg = undef - $dm_mountopt = undef - $dm_blocksize = undef - $dm_loopdatasize = undef - $dm_loopmetadatasize = undef - $dm_datadev = undef - $dm_metadatadev = undef - $dm_thinpooldev = undef - $dm_use_deferred_removal = undef - $dm_use_deferred_deletion = undef - $dm_blkdiscard = undef - $dm_override_udev_sync_check = undef - $overlay2_override_kernel_check = false - $manage_package = true - $package_source = undef - $service_name_default = 'docker' - $docker_group_default = 'docker' - $storage_devs = undef - $storage_vg = undef - $storage_root_size = undef - $storage_data_size = undef - $storage_min_data_size = undef - $storage_chunk_size = undef - $storage_growpart = undef - $storage_auto_extend_pool = undef - $storage_pool_autoextend_threshold = undef - $storage_pool_autoextend_percent = undef - $storage_config_template = 'docker/etc/sysconfig/docker-storage.epp' - $registry_mirror = undef - $curl_ensure = true - $os_lc = downcase($facts['os']['name']) - $docker_msft_provider_version = undef - $nuget_package_provider_version = undef - $docker_command = 'docker' + $version = undef + $ensure = present + $docker_ce_start_command = 'dockerd' + $docker_ce_package_name = 'docker-ce' + $docker_ce_cli_package_name = 'docker-ce-cli' + $docker_engine_start_command = 'docker daemon' + $docker_engine_package_name = 'docker-engine' + $docker_ce_channel = stable + $docker_ee = false + $docker_ee_start_command = 'dockerd' + $docker_ee_source_location = undef + $docker_ee_key_source = undef + $docker_ee_key_id = undef + $docker_ee_repos = stable + $tcp_bind = undef + $tls_enable = false + $tls_verify = true + $machine_version = '0.16.1' + $ip_forward = true + $iptables = true + $ipv6 = false + $ipv6_cidr = undef + $default_gateway_ipv6 = undef + $icc = undef + $ip_masq = true + $bip = undef + $mtu = undef + $fixed_cidr = undef + $bridge = undef + $default_gateway = undef + $socket_bind = 'unix:///var/run/docker.sock' + $log_level = undef + $log_driver = undef + $log_opt = [] + $selinux_enabled = undef + $socket_group_default = 'docker' + $labels = [] + $service_state = running + $service_enable = true + $manage_service = true + $root_dir = undef + $tmp_dir_config = true + $tmp_dir = '/tmp/' + $dns = undef + $dns_search = undef + $proxy = undef + $compose_version = undef + $no_proxy = undef + $execdriver = undef + $storage_driver = undef + $dm_basesize = undef + $dm_fs = undef + $dm_mkfsarg = undef + $dm_mountopt = undef + $dm_blocksize = undef + $dm_loopdatasize = undef + $dm_loopmetadatasize = undef + $dm_datadev = undef + $dm_metadatadev = undef + $dm_thinpooldev = undef + $dm_use_deferred_removal = undef + $dm_use_deferred_deletion = undef + $dm_blkdiscard = undef + $dm_override_udev_sync_check = undef + $overlay2_override_kernel_check = false + $manage_package = true + $package_source = undef + $service_name_default = 'docker' + $docker_group_default = 'docker' + $storage_devs = undef + $storage_vg = undef + $storage_root_size = undef + $storage_data_size = undef + $storage_min_data_size = undef + $storage_chunk_size = undef + $storage_growpart = undef + $storage_auto_extend_pool = undef + $storage_pool_autoextend_threshold = undef + $storage_pool_autoextend_percent = undef + $storage_config_template = 'docker/etc/sysconfig/docker-storage.epp' + $registry_mirror = undef + $curl_ensure = true + $os_lc = downcase($facts['os']['name']) + $docker_msft_provider_version = undef + $nuget_package_provider_version = undef + $docker_command = 'docker' + $run_systemd_start_limit_interval_sec = 20 + $run_systemd_start_limit_burst = 3 if ($facts['os']['family'] == 'windows') { $docker_ee_package_name = 'Docker' diff --git a/manifests/run.pp b/manifests/run.pp index efe4c6ca..f925a3b3 100644 --- a/manifests/run.pp +++ b/manifests/run.pp @@ -191,6 +191,10 @@ # # @param read_only # +# @param systemd_start_limit_interval_sec +# +# @param systemd_start_limit_burst +# define docker::run ( Optional[Pattern[/^[\S]*$/]] $image = undef, Enum[present,absent] $ensure = 'present', @@ -225,6 +229,8 @@ Optional[Boolean] $detach = undef, Optional[Variant[String,Array[String]]] $extra_parameters = undef, String $systemd_restart = 'on-failure', + Integer $systemd_start_limit_interval_sec = $docker::run_systemd_start_limit_interval_sec, + Integer $systemd_start_limit_burst = $docker::run_systemd_start_limit_burst, Variant[String,Hash] $extra_systemd_parameters = {}, Boolean $pull_on_start = false, Variant[String,Array] $after = [], @@ -619,19 +625,21 @@ if $service_provider_real == 'systemd' { $init_template_parameters = { - 'depend_services_array' => $depend_services_array, - 'sanitised_after_array' => $sanitised_after_array, - 'service_prefix' => $service_prefix, - 'sanitised_depends_array' => $sanitised_depends_array, - 'title' => $title, - 'have_systemd_v230' => $docker::params::have_systemd_v230, - 'extra_systemd_parameters' => $extra_systemd_parameters, - 'systemd_restart' => $systemd_restart, - '_syslog_identifier' => $_syslog_identifier, - 'syslog_facility' => $syslog_facility, - 'sanitised_title' => $sanitised_title, - 'remain_after_exit' => $remain_after_exit, - 'service_name' => $service_name, + 'depend_services_array' => $depend_services_array, + 'sanitised_after_array' => $sanitised_after_array, + 'service_prefix' => $service_prefix, + 'sanitised_depends_array' => $sanitised_depends_array, + 'title' => $title, + 'have_systemd_v230' => $docker::params::have_systemd_v230, + 'extra_systemd_parameters' => $extra_systemd_parameters, + 'systemd_restart' => $systemd_restart, + 'systemd_start_limit_interval_sec' => $systemd_start_limit_interval_sec, + 'systemd_start_limit_burst' => $systemd_start_limit_burst, + '_syslog_identifier' => $_syslog_identifier, + 'syslog_facility' => $syslog_facility, + 'sanitised_title' => $sanitised_title, + 'remain_after_exit' => $remain_after_exit, + 'service_name' => $service_name, } } elsif $service_provider_real == 'upstart' { $init_template_parameters = { diff --git a/templates/etc/systemd/system/docker-run.epp b/templates/etc/systemd/system/docker-run.epp index 92990cbb..6754da43 100644 --- a/templates/etc/systemd/system/docker-run.epp +++ b/templates/etc/systemd/system/docker-run.epp @@ -16,8 +16,8 @@ After=<%= $after.unique.join(" ") %> Wants=<%= $wants.unique.join(" ") %> Requires=<%= $requires.unique.join(" ") %> <%- if $have_systemd_v230 { -%> -StartLimitIntervalSec=20 -StartLimitBurst=3 +StartLimitIntervalSec=<%= $systemd_start_limit_interval_sec %> +StartLimitBurst=<%= $systemd_start_limit_burst %> <% } -%> <%- if $extra_systemd_parameters['Unit'] { -%> <%- $extra_systemd_parameters['Unit'].each |$key, $value| { %> @@ -28,8 +28,8 @@ StartLimitBurst=3 [Service] Restart=<%= $systemd_restart %> <%- unless $have_systemd_v230 { -%> -StartLimitInterval=20 -StartLimitBurst=3 +StartLimitInterval=<%= $systemd_start_limit_interval_sec %> +StartLimitBurst=3<%= $systemd_start_limit_burst %> <% } -%> TimeoutStartSec=0 RestartSec=5