Drop EoL upstart configuration

Upstart is a legacy init system that's not supported by any of the operating systems that are supported by the docker module.
puppetlabs · Sep 3, 2024 · ef49571 · ef49571
1 parent 63e09a1
commit ef49571
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 154 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -108,28 +108,16 @@
         'Ubuntu' : {
           $package_release = "ubuntu-${facts['os']['distro']['codename']}"
 
-          if (versioncmp($facts['os']['release']['full'], '15.04') >= 0) {
-            $service_after_override     = undef
-            $service_config_template    = 'docker/etc/sysconfig/docker.systemd.epp'
-            $service_hasrestart         = true
-            $service_hasstatus          = true
-            $service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.epp'
-            $service_provider           = 'systemd'
-            $socket_override            = false
-            $socket_overrides_template  = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.epp'
-            $storage_config             = '/etc/default/docker-storage'
-            include docker::systemd_reload
-          } else {
-            $service_config_template    = 'docker/etc/default/docker.epp'
-            $service_overrides_template = undef
-            $socket_overrides_template  = undef
-            $socket_override            = false
-            $service_after_override     = undef
-            $service_provider           = 'upstart'
-            $service_hasstatus          = true
-            $service_hasrestart         = false
-            $storage_config             = undef
-          }
+          $service_after_override     = undef
+          $service_config_template    = 'docker/etc/sysconfig/docker.systemd.epp'
+          $service_hasrestart         = true
+          $service_hasstatus          = true
+          $service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.epp'
+          $service_provider           = 'systemd'
+          $socket_override            = false
+          $socket_overrides_template  = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.epp'
+          $storage_config             = '/etc/default/docker-storage'
+          include docker::systemd_reload
         }
         default: {
           if (versioncmp($facts['facterversion'], '2.4.6') <= 0) {

diff --git a/manifests/run.pp b/manifests/run.pp
@@ -516,15 +516,6 @@
         $mode               = '0644'
         $hasstatus          = true
       }
-      'upstart': {
-        $initscript         = "/etc/init.d/${service_prefix}${sanitised_title}"
-        $init_template      = 'docker/etc/init.d/docker-run.epp'
-        $mode               = '0750'
-        $startscript        = undef
-        $stopscript         = undef
-        $startstop_template = undef
-        $hasstatus          = true
-      }
       default: {
         if $facts['os']['family'] != 'windows' {
           fail('Docker needs a Debian or RedHat based system.')
@@ -617,33 +608,20 @@
         }
       }
 
-      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,
-        }
-      } elsif $service_provider_real == 'upstart' {
-        $init_template_parameters = {
-          'sanitised_after_array'   => $sanitised_after_array,
-          'service_prefix'          => $service_prefix,
-          'sanitised_depends_array' => $sanitised_depends_array,
-          'depend_services_array'   => $depend_services_array,
-          'docker_command'          => $docker_command,
-          'sanitised_title'         => $sanitised_title,
-          'docker_run_inline_start' => $docker_run_inline_start,
-          'docker_run_inline_stop'  => $docker_run_inline_stop,
-        }
+      $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,
       }
 
       file { $initscript:

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -367,14 +367,6 @@
         refreshonly => true,
       }
     }
-    'upstart': {
-      file { '/etc/init.d/docker':
-        ensure => 'link',
-        target => '/lib/init/upstart-job',
-        force  => true,
-        notify => $_manage_service,
-      }
-    }
     default: {}
   }
 

diff --git a/spec/defines/run_spec.rb b/spec/defines/run_spec.rb
@@ -363,7 +363,7 @@ class { 'docker':
                                     params['service_provider']
                                   end
 
-          if !params['service_provider_real'] == 'systemd' && !params['service_provider_real'] == 'upstart'
+          if !params['service_provider_real'] == 'systemd'
             if facts[:os]['family'] != 'windows'
               it {
                 expect(subject).to compile.and_raise_error('Docker needs a Debian or RedHat based system.')

diff --git a/spec/shared_examples/run.rb b/spec/shared_examples/run.rb
@@ -156,13 +156,6 @@
       mode               = '0644'
       startscript        = "/usr/local/bin/docker-run-#{sanitised_title}-start.sh"
       stopscript         = "/usr/local/bin/docker-run-#{sanitised_title}-stop.sh"
-    when 'upstart'
-      hasstatus          = true
-      initscript         = "/etc/init.d/#{service_prefix}#{sanitised_title}"
-      mode               = '0750'
-      startscript        = nil
-      stopscript         = nil
-    else
       hasstatus = defaults['service_hasstatus']
     end
 

diff --git a/spec/shared_examples/service.rb b/spec/shared_examples/service.rb
@@ -87,16 +87,6 @@
         manage_service,
       )
     }
-  when 'upstart'
-    it {
-      expect(subject).to contain_file('/etc/init.d/docker').with(
-        'ensure' => 'link',
-        'target' => '/lib/init/upstart-job',
-        'force' => true,
-      ).that_notifies(
-        manage_service,
-      )
-    }
   end
 
   if params['storage_config'] != :undef

diff --git a/templates/etc/default/docker.epp b/templates/etc/default/docker.epp