Merge pull request #298 from bflad/restart-deprecation

Further deprecate daemon restart flag by default, which interferes with restart policies

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

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

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
 

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
 

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