summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-06-19 09:33:58 +0200
committerMartin André <m.andre@redhat.com>2017-06-19 09:33:58 +0200
commit39ee601e77b180bacbf57f8890bb517d3997b331 (patch)
tree756dc2a739255de387461d2f5acc2c0cc37e47b0
parentcb0ae4a630f69bc8d2899f02f1e5ee98daa48ffc (diff)
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
Notes
Notes (review): Code-Review+2: Juan Antonio Osorio Robles <jaosorior@redhat.com> Code-Review+2: Steven Hardy <shardy@redhat.com> Code-Review+2: Jiri Stransky <jistr@redhat.com> Workflow+1: Emilien Macchi <emilien@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 19 Jun 2017 13:46:08 +0000 Reviewed-on: https://review.openstack.org/475274 Project: openstack/tripleo-heat-templates Branch: refs/heads/master
-rw-r--r--environments/docker.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 104f8fc..6a5ec87 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -5,6 +5,8 @@ resource_registry:
5 # The compute node still needs extra initialization steps 5 # The compute node still needs extra initialization steps
6 OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml 6 OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
7 7
8 OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
9
8 #NOTE (dprince) add roles to be docker enabled as we support them 10 #NOTE (dprince) add roles to be docker enabled as we support them
9 OS::TripleO::Services::NovaLibvirt: ../docker/services/nova-libvirt.yaml 11 OS::TripleO::Services::NovaLibvirt: ../docker/services/nova-libvirt.yaml
10 OS::TripleO::Services::ComputeNeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml 12 OS::TripleO::Services::ComputeNeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml