refactor of docker-wait-ready

libraries/docker_service_base.rb

@@ -68,6 +68,9 @@ class DockerServiceBase < DockerBase
     # logging
     property :logfile, String, default: '/var/log/docker.log'
 
+    # docker-wait-ready timeout
+    property :service_timeout, Integer, default: 20
+
     allowed_actions :start, :stop, :restart
 
     alias label labels
@@ -76,5 +79,35 @@ class DockerServiceBase < DockerBase
     alias tlskey tls_server_key
     alias tlsverify tls_verify
     alias run_group group
+
+    declare_action_class.class_eval do
+      def libexec_dir
+        return '/usr/libexec/docker' if node['platform_family'] == 'rhel'
+        '/usr/lib/docker'
+      end
+
+      def create_docker_wait_ready
+        directory libexec_dir do
+          owner 'root'
+          group 'root'
+          mode '0755'
+          action :create
+        end
+
+        template "#{libexec_dir}/#{docker_name}-wait-ready" do
+          source 'default/docker-wait-ready.erb'
+          owner 'root'
+          group 'root'
+          mode '0755'
+          variables(
+            docker_cmd: docker_cmd,
+            libexec_dir: libexec_dir,
+            service_timeout: service_timeout
+          )
+          cookbook 'docker'
+          action :create
+        end
+      end
+    end
   end
 end

libraries/docker_service_manager_execute.rb

@@ -33,22 +33,9 @@ class DockerServiceManagerExecute < DockerServiceBase
         action :run
       end
 
-      # loop until docker docker is available
-      bash "docker-wait-ready #{name}" do
-        code <<-EOF
-            timeout=0
-            while [ $timeout -lt 20 ];  do
-              #{docker_cmd} ps | head -n 1 | grep ^CONTAINER
-                if [ $? -eq 0 ]; then
-                  break
-                fi
-              ((timeout++))
-               sleep 1
-            done
-            [[ $timeout -eq 20 ]] && exit 1
-            exit 0
-            EOF
-        not_if "#{docker_cmd} ps | head -n 1 | grep ^CONTAINER"
+      create_docker_wait_ready
+      execute 'docker-wait-ready' do
+        command "#{libexec_dir}/#{docker_name}-wait-ready"
       end
     end
 

libraries/docker_service_manager_systemd.rb

@@ -16,36 +16,8 @@ class DockerServiceManagerSystemd < DockerServiceBase
       node['platform_version'].to_f >= 15.04
     end
 
-    property :service_timeout, Integer, default: 20
-
-    def libexec_dir
-      return '/usr/libexec/docker' if node['platform_family'] == 'rhel'
-      '/usr/lib/docker'
-    end
-
     action :start do
-      directory libexec_dir do
-        owner 'root'
-        group 'root'
-        mode '0755'
-        action :create
-      end
-
-      # this script is called by the main systemd unit file, and
-      # spins around until the service is actually up and running.
-      template "#{libexec_dir}/#{docker_name}-wait-ready" do
-        source 'systemd/docker-wait-ready.erb'
-        owner 'root'
-        group 'root'
-        mode '0755'
-        variables(
-          docker_cmd: docker_cmd,
-          libexec_dir: libexec_dir,
-          service_timeout: service_timeout
-        )
-        cookbook 'docker'
-        action :create
-      end
+      create_docker_wait_ready
 
       # stock systemd unit file
       template "/lib/systemd/system/#{docker_name}.service" do
@@ -55,7 +27,7 @@ def libexec_dir
         mode '0644'
         variables(
           docker_name: docker_name,
-          docker_socket: connect_socket
+          docker_socket: connect_socket.sub(%r{unix://|fd://}, '')
         )
         cookbook 'docker'
         action :create
@@ -83,8 +55,7 @@ def libexec_dir
         variables(
           config: new_resource,
           docker_daemon_cmd: docker_daemon_cmd,
-          docker_name: docker_name,
-          libexec_dir: libexec_dir
+          docker_wait_ready: "#{libexec_dir}/#{docker_name}-wait-ready"
         )
         cookbook 'docker'
         notifies :run, 'execute[systemctl daemon-reload]', :immediately

libraries/docker_service_manager_sysvinit_debian.rb

@@ -19,9 +19,9 @@ class DockerServiceManagerSysvinitDebian < DockerServiceBase
     end
 
     action :start do
+      create_docker_wait_ready
       create_init
       create_service
-      wait_ready
     end
 
     action :stop do
@@ -56,10 +56,10 @@ def create_init
           mode '0755'
           variables(
             docker_name: docker_name,
-            docker_daemon_arg: docker_daemon_arg
+            docker_daemon_arg: docker_daemon_arg,
+            docker_wait_ready: "#{libexec_dir}/#{docker_name}-wait-ready"
           )
           cookbook 'docker'
-          not_if { docker_name == 'docker' && ::File.exist?('/etc/init.d/docker') }
           action :create
         end
 
@@ -82,25 +82,6 @@ def create_service
           action [:enable, :start]
         end
       end
-
-      def wait_ready
-        bash "docker-wait-ready #{name}" do
-          code <<-EOF
-            timeout=0
-            while [ $timeout -lt 20 ];  do
-              #{docker_cmd} ps | head -n 1 | grep ^CONTAINER
-              if [ $? -eq 0 ]; then
-                break
-              fi
-              ((timeout++))
-              sleep 1
-            done
-            [[ $timeout -eq 20 ]] && exit 1
-            exit 0
-            EOF
-          not_if "#{docker_cmd} ps | head -n 1 | grep ^CONTAINER"
-        end
-      end
     end
   end
 end

libraries/docker_service_manager_sysvinit_rhel.rb

@@ -15,9 +15,9 @@ class DockerServiceManagerSysvinitRhel < DockerServiceBase
     end
 
     action :start do
+      create_docker_wait_ready
       create_init
       create_service
-      wait_ready
     end
 
     action :stop do
@@ -52,10 +52,10 @@ def create_init
           mode '0755'
           variables(
             docker_name: docker_name,
-            docker_daemon_arg: docker_daemon_arg
+            docker_daemon_arg: docker_daemon_arg,
+            docker_wait_ready: "#{libexec_dir}/#{docker_name}-wait-ready"
           )
           cookbook 'docker'
-          not_if { docker_name == 'docker' && ::File.exist?('/etc/init.d/docker') }
           action :create
         end
 
@@ -77,25 +77,6 @@ def create_service
           action [:enable, :start]
         end
       end
-
-      def wait_ready
-        bash "docker-wait-ready #{name}" do
-          code <<-EOF
-            timeout=0
-            while [ $timeout -lt 20 ];  do
-              #{docker_cmd} ps | head -n 1 | grep ^CONTAINER
-              if [ $? -eq 0 ]; then
-                break
-              fi
-              ((timeout++))
-              sleep 1
-            done
-            [[ $timeout -eq 20 ]] && exit 1
-            exit 0
-            EOF
-          not_if "#{docker_cmd} ps | head -n 1 | grep ^CONTAINER"
-        end
-      end
     end
   end
 end

libraries/docker_service_manager_upstart.rb

@@ -6,6 +6,8 @@ class DockerServiceManagerUpstart < DockerServiceBase
     provides :docker_service_manager, platform: 'linuxmint'
 
     action :start do
+      create_docker_wait_ready
+
       template "/etc/init/#{docker_name}.conf" do
         source 'upstart/docker.conf.erb'
         owner 'root'
@@ -14,10 +16,9 @@ class DockerServiceManagerUpstart < DockerServiceBase
         variables(
           docker_name: docker_name,
           docker_daemon_arg: docker_daemon_arg,
-          docker_socket: connect_socket
+          docker_wait_ready: "#{libexec_dir}/#{docker_name}-wait-ready"
         )
         cookbook 'docker'
-        not_if { docker_name == 'default' && ::File.exist?('/etc/init/docker.conf') }
         action :create
       end
 
@@ -37,24 +38,6 @@ class DockerServiceManagerUpstart < DockerServiceBase
         supports status: true
         action :start
       end
-
-      # FIXME: why do we need this? This should be handled in init
-      bash "docker-wait-ready #{name}" do
-        code <<-EOF
-            timeout=0
-            while [ $timeout -lt 20 ];  do
-              #{docker_cmd} ps | head -n 1 | grep ^CONTAINER
-              if [ $? -eq 0 ]; then
-                break
-              fi
-              ((timeout++))
-              sleep 1
-            done
-            [[ $timeout -eq 20 ]] && exit 1
-            exit 0
-            EOF
-        not_if "#{docker_cmd} ps | head -n 1 | grep ^CONTAINER"
-      end
     end
 
     action :stop do

libraries/helpers_service.rb

@@ -76,7 +76,7 @@ def connect_socket
           c_b = 3 unless c_b
           c_a <=> c_b
         end
-        sorted.first.sub(%r{unix://|fd://}, '')
+        sorted.first
       end
 
       def coerce_host(v)

templates/default/systemd/docker.service-override.erb

@@ -24,7 +24,7 @@ ExecStartPre=/sbin/sysctl -w net.ipv4.ip_forward=1
 ExecStartPre=/sbin/sysctl -w net.ipv6.conf.all.forwarding=1
 <% end %>
 ExecStart=<%= @docker_daemon_cmd %>
-ExecStartPost=<%= @libexec_dir %>/<%= @docker_name %>-wait-ready
+ExecStartPost=<%= @docker_wait_ready %>
 Restart=always
 MountFlags=private
 LimitNOFILE=1048576