Skip to content

Commit 608c389

Browse files
authored
Remove references to service managers that no longer exist (sous-chefs#1201)
Signed-off-by: Dan Webb <[email protected]>
1 parent dcbb089 commit 608c389

File tree

5 files changed

+3
-34
lines changed

5 files changed

+3
-34
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
- Remove old refernces to services managers that no longer exist
11+
1012
## 10.0.0 - *2021-10-20*
1113

1214
- Remove the sysvinit Docker Service managers

README.md

-12
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ test/cookbooks/docker_test/
8484
- [docker_installation_script](#docker_installation_script): curl | bash
8585
- [docker_installation_package](#docker_installation_package): package 'docker-ce'
8686
- [docker_service_manager_execute](#docker_service_manager_execute): manage docker daemon with Chef
87-
- [docker_service_manager_sysvinit](#docker_service_manager_sysvinit): manage docker daemon with a sysvinit script
8887
- [docker_service_manager_systemd](#docker_service_manager_systemd): manage docker daemon with systemd unit files
8988
- [docker_image](#docker_image): image/repository operations
9089
- [docker_container](#docker_container): container operations
@@ -272,17 +271,6 @@ docker_service_manager_execute 'default' do
272271
end
273272
```
274273

275-
## docker_service_manager_sysvinit
276-
277-
### Example
278-
279-
```ruby
280-
docker_service_manager_sysvinit 'default' do
281-
host 'unix:///var/run/docker.sock'
282-
action :stop
283-
end
284-
```
285-
286274
## docker_service_manager_systemd
287275

288276
### Example

documentation/docker_service.md

-1
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,4 @@ The `docker_service` resource property list mostly corresponds to the options fo
113113
## `docker_service` implementations
114114

115115
- `docker_service_execute` - The simplest docker_service. Just starts a process. Fire and forget.
116-
- `docker_service_sysvinit` - Uses a SystemV init script to manage the service state.
117116
- `docker_service_systemd` - Uses an Systemd unit file to manage the service state. NOTE: This does NOT enable systemd socket activation.

libraries/docker_service.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class DockerService < DockerServiceBase
99

1010
# installation type and service_manager
1111
property :install_method, %w(script package tarball none auto), default: lazy { docker_install_method }, desired_state: false
12-
property :service_manager, %w(execute sysvinit upstart systemd auto), default: 'auto', desired_state: false
12+
property :service_manager, %w(execute systemd auto), default: 'auto', desired_state: false
1313

1414
# docker_installation_script
1515
property :repo, String, desired_state: false
@@ -76,8 +76,6 @@ def svc_manager(&block)
7676
svc = docker_service_manager(new_resource.name, &block)
7777
when 'execute'
7878
svc = docker_service_manager_execute(new_resource.name, &block)
79-
when 'sysvinit'
80-
svc = docker_service_manager_sysvinit(new_resource.name, &block)
8179
when 'systemd'
8280
svc = docker_service_manager_systemd(new_resource.name, &block)
8381
end

templates/default/default/docker.erb

-18
This file was deleted.

0 commit comments

Comments
 (0)