Ensure docker* services is enabled and running

Change-Id: I55aa2d68ee56c0c1ca386059519fa7b736ee2f4d
Closes-Bug: #1535308

deployment/puppet/docker/manifests/systemd/config.pp

@@ -23,13 +23,20 @@ define docker::systemd::config( $release, $depends, $timeout ) {
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    notify  => Service["docker-${title}"]
+    notify  => Exec['/usr/bin/systemctl daemon-reload'],
+  }
+
+  if !defined(Exec['/usr/bin/systemctl daemon-reload']) {
+    exec { '/usr/bin/systemctl daemon-reload':
+      command     => '/usr/bin/systemctl daemon-reload',
+      refreshonly => true,
+    }
   }
 
-  # We use ensure => undef to prevent unnecessary start service
-  # because at first boot time, the container is launched by dockerctl
   service { "docker-${title}":
-    ensure => undef,
-    enable => true,
+    ensure    => running,
+    enable    => true,
+    require   => Exec['/usr/bin/systemctl daemon-reload'],
+    subscribe => File["/usr/lib/systemd/system/docker-${title}.service"],
   }
 }

tests/noop/spec/hosts/master/host-only_spec.rb

@@ -114,7 +114,7 @@ describe manifest do
             :mode  => '0644',
           })
           should contain_service("docker-#{container}").with({
-            :ensure => nil, # we shouldn't start container from puppet
+            :ensure => 'running',
             :enable => 'true',
           })
         end