From: Martin André <m.andre@redhat.com>
Date: Mon, 19 Jun 2017 07:33:58 +0000 (+0200)
Subject: Re-enable docker service in docker.yaml
X-Git-Tag: opnfv-6.0.0~516
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=39ee601e77b180bacbf57f8890bb517d3997b331;p=apex-tripleo-heat-templates.git

Re-enable docker service in docker.yaml

It was removed by mistake from the docker.yaml environment file in
I76f188438bfc6449b152c2861d99738e6eb3c61b.

Change-Id: If8df98e1ddd0961ab0c9e5df917fef8200db65e6
Closes-Bug: #1698749
---

diff --git a/environments/docker.yaml b/environments/docker.yaml
index 104f8fcf..6a5ec87a 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -5,6 +5,8 @@ resource_registry:
   # The compute node still needs extra initialization steps
   OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
 
+  OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
+
   #NOTE (dprince) add roles to be docker enabled as we support them
   OS::TripleO::Services::NovaLibvirt: ../docker/services/nova-libvirt.yaml
   OS::TripleO::Services::ComputeNeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml