multi service support for docker_service_manager_upstart

.kitchen.cloud.yml

@@ -287,6 +287,13 @@ suites:
   run_list:
   - recipe[docker_test::service_upstart]
 
+- name: service-upstart-multi
+  includes: [
+    'ubuntu-14.04'
+  ]
+  run_list:
+  - recipe[docker_test::service_upstart_multi]
+
 #################################
 # docker_service_systemd resource
 #################################

libraries/docker_service_manager_upstart.rb

@@ -5,36 +5,36 @@ class DockerServiceManagerUpstart < DockerServiceBase
     provides :docker_service_manager, platform: 'ubuntu'
 
     action :start do
-      template '/etc/init/docker.conf' do
-        path '/etc/init/docker.conf'
+      template "/etc/init/#{docker_name}.conf" do
         source 'upstart/docker.conf.erb'
         owner 'root'
         group 'root'
         mode '0644'
         variables(
           config: new_resource,
+          docker_name: docker_name,
           docker_cmd: docker_cmd,
           docker_daemon_cmd: docker_daemon_cmd
         )
         cookbook 'docker'
-        notifies :restart, new_resource unless ::File.exist? '/etc/docker-firstconverge'
+        notifies :restart, new_resource unless ::File.exist? "/etc/#{docker_name}-firstconverge"
         notifies :restart, new_resource if auto_restart
         action :create
       end
 
-      file '/etc/docker-firstconverge' do
+      file "/etc/#{docker_name}-firstconverge" do
         action :create
       end
 
-      service 'docker' do
+      service docker_name do
         provider Chef::Provider::Service::Upstart
         supports status: true
         action :start
       end
     end
 
     action :stop do
-      service 'docker' do
+      service docker_name do
         provider Chef::Provider::Service::Upstart
         supports status: true
         action :stop

templates/default/upstart/docker.conf.erb

@@ -1,4 +1,4 @@
-description "Docker daemon"
+description "<%= @docker_name %> daemon"
 
 start on (filesystem and net-device-up IFACE!=lo)
 stop on runlevel [!2345]

test/cookbooks/docker_test/recipes/service_upstart_multi.rb

@@ -0,0 +1,63 @@
+# installation
+docker_installation_binary 'default' do
+  action :create
+end
+
+# service named 'default'
+docker_service_manager_upstart 'default' do
+  graph '/var/lib/docker'
+  host 'unix:///var/run/docker.sock'
+  action :start
+end
+
+docker_image 'busybox' do
+  host 'unix:///var/run/docker.sock'
+end
+
+docker_container 'service default echo server' do
+  container_name 'an_echo_server'
+  repo 'busybox'
+  command 'nc -ll -p 7 -e /bin/cat'
+  port '7:7'
+  action :run
+end
+
+# service A
+docker_service_manager_upstart 'one' do
+  graph '/var/lib/docker-one'
+  host 'unix:///var/run/docker-one.sock'
+  action :start
+end
+
+docker_image 'hello-world' do
+  host 'unix:///var/run/docker-one.sock'
+  tag 'latest'
+end
+
+docker_container 'hello-world' do
+  host 'unix:///var/run/docker-one.sock'
+  command '/hello'
+  action :create
+end
+
+# service B
+docker_service_manager_upstart 'two' do
+  graph '/var/lib/docker-two'
+  host 'unix:///var/run/docker-two.sock'
+  action :start
+end
+
+docker_image 'alpine' do
+  host 'unix:///var/run/docker-two.sock'
+  tag '3.1'
+end
+
+docker_container 'service two echo_server' do
+  container_name 'an_echo_server'
+  repo 'alpine'
+  tag '3.1'
+  command 'nc -ll -p 7 -e /bin/cat'
+  port '7:7'
+  host 'unix:///var/run/docker-two.sock'
+  action :run
+end

test/integration/service-upstart-multi/serverspec/assert_functioning_spec.rb

@@ -0,0 +1,36 @@
+# # a service named default
+describe command('docker images') do
+  its(:exit_status) { should eq 0 }
+  its(:stdout) { should match(/busybox/) }
+end
+
+describe command('docker ps -a') do
+  its(:exit_status) { should eq 0 }
+  its(:stdout) { should match(/an_echo_server/) }
+end
+
+# service A
+describe command('docker --host=unix:///var/run/docker-one.sock images') do
+  its(:exit_status) { should eq 0 }
+  its(:stdout) { should match(/^hello-world/) }
+  its(:stdout) { should_not match(/^alpine/) }
+end
+
+describe command('docker --host=unix:///var/run/docker-one.sock ps -a') do
+  its(:exit_status) { should eq 0 }
+  its(:stdout) { should match(/hello-world/) }
+  its(:stdout) { should_not match(/an_echo_server/) }
+end
+
+# service B
+describe command('docker --host=unix:///var/run/docker-two.sock images') do
+  its(:exit_status) { should eq 0 }
+  its(:stdout) { should_not match(/^hello-world/) }
+  its(:stdout) { should match(/^alpine/) }
+end
+
+describe command('docker --host=unix:///var/run/docker-two.sock ps -a') do
+  its(:exit_status) { should eq 0 }
+  its(:stdout) { should_not match(/hello-world/) }
+  its(:stdout) { should match(/an_echo_server/) }
+end