From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 11 Mar 2016 13:55:03 +0000 (+0000)
Subject: Merge "Remove unused Neutron Agents container"
X-Git-Tag: opnfv-6.0.0~2096
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=af068151a36229d82cf4f85991a9c41e378dd229;p=apex-tripleo-heat-templates.git

Merge "Remove unused Neutron Agents container"
---

af068151a36229d82cf4f85991a9c41e378dd229
diff --cc environments/docker.yaml
index 62804062,db0e6ef4..be21d842
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@@ -14,10 -14,8 +14,9 @@@ parameter_defaults
    DockerNamespaceIsRegistry: false
    # Compute Node Images
    DockerComputeImage: centos-binary-nova-compute:latest
 +  DockerAgentImage: heat-docker-agents:latest
    DockerComputeDataImage: centos-binary-data:latest
    DockerLibvirtImage: centos-binary-nova-libvirt:latest
-   DockerNeutronAgentImage: centos-binary-neutron-agents:latest
    DockerOpenvswitchImage: centos-binary-neutron-openvswitch-agent:latest
    DockerOvsVswitchdImage: centos-binary-openvswitch-vswitchd:latest
    DockerOpenvswitchDBImage: centos-binary-openvswitch-db-server:latest