From 910c9d57a95aab32d4f40b6e1e051e6bb604eb01 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2015 03:28:28 -0400 Subject: [PATCH 1/3] Further deprecate daemon restart flag by default, which interferes with restart policies --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 90c7dc386a..2c8a30d0d0 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -199,4 +199,4 @@ # Other attributes # DEPRECATED: will be removed in chef-docker 1.0 -default['docker']['restart'] = false if node['docker']['container_init_type'] +default['docker']['restart'] = nil From 0ba7ea0dc56624d44202ca526825572f809ba6f4 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2015 03:29:47 -0400 Subject: [PATCH 2/3] Update daemon restart nil default in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c6702f454f..ac162a1b54 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ options | Additional options to pass to docker. These could be flags like "-api- pidfile | Path to use for daemon PID file | String | nil (implicitly /var/run/docker.pid) ramdisk | Set DOCKER_RAMDISK when using RAM disk | TrueClass or FalseClass | false registry-mirror | List of docker registry mirrors | String, Array | nil -restart (*DEPRECATED*) | Restart containers on boot | TrueClass or FalseClass | auto-detected (see attributes/default.rb) +restart (*DEPRECATED*) | Restart containers on boot | TrueClass or FalseClass | nil selinux_enabled | Enable SELinux | TrueClass or FalseClass | nil storage_driver | Storage driver for docker | String | nil storage_opt | Storage driver options | String, Array | nil From be9993b16ef3709c904b7c7172e28daf0acf9af0 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 14 Apr 2015 03:40:33 -0400 Subject: [PATCH 3/3] Update restart=false spec tests for attribute default change --- spec/systemd_spec.rb | 4 ++-- spec/sysv_spec.rb | 4 ++-- spec/upstart_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/systemd_spec.rb b/spec/systemd_spec.rb index 5905393efb..eda2b87d44 100644 --- a/spec/systemd_spec.rb +++ b/spec/systemd_spec.rb @@ -88,10 +88,10 @@ end # DEPRECATED: will be removed in chef-docker 1.0 - context 'when container_init_type is set' do + context 'when restart is set' do let(:chef_run) do runner = ChefSpec::SoloRunner.new - runner.node.set['docker']['container_init_type'] = 'upstart' + runner.node.set['docker']['restart'] = false runner.converge(described_recipe) end diff --git a/spec/sysv_spec.rb b/spec/sysv_spec.rb index 65a74b3904..e98c97e5a1 100644 --- a/spec/sysv_spec.rb +++ b/spec/sysv_spec.rb @@ -99,10 +99,10 @@ end # DEPRECATED: will be removed in chef-docker 1.0 - context 'when container_init_type is set' do + context 'when restart is set' do let(:chef_run) do runner = ChefSpec::SoloRunner.new - runner.node.set['docker']['container_init_type'] = 'upstart' + runner.node.set['docker']['restart'] = false runner.converge(described_recipe) end diff --git a/spec/upstart_spec.rb b/spec/upstart_spec.rb index 259f899750..8b09e0154e 100644 --- a/spec/upstart_spec.rb +++ b/spec/upstart_spec.rb @@ -100,10 +100,10 @@ end # DEPRECATED: will be removed in chef-docker 1.0 - context 'when container_init_type is set' do + context 'when restart is set' do let(:chef_run) do runner = ChefSpec::SoloRunner.new - runner.node.set['docker']['container_init_type'] = 'upstart' + runner.node.set['docker']['restart'] = false runner.converge(described_recipe) end