diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-11 13:55:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-11 13:55:04 +0000 |
| commit | af068151a36229d82cf4f85991a9c41e378dd229 (patch) | |
| tree | 6c4478bfdaf85afb4a806e95694b35facfaf62eb /environments | |
| parent | 48011d2718ec852276ba01dc867194a375fe3762 (diff) | |
| parent | a0b9dacf95d7d31f409dbd507b57a782ecb313e2 (diff) | |
Merge "Remove unused Neutron Agents container"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker-network-isolation.yaml | 6 | ||||
| -rw-r--r-- | environments/docker.yaml | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/environments/docker-network-isolation.yaml b/environments/docker-network-isolation.yaml index 257d03dc..87c81d0b 100644 --- a/environments/docker-network-isolation.yaml +++ b/environments/docker-network-isolation.yaml @@ -1,4 +1,4 @@ parameter_defaults: - NeutronAgentConfig: "/etc/neutron/neutron.conf,/etc/neutron/plugins/openvswitch/openvswitch_agent.ini" - NeutronAgentPluginVolume: "/var/lib/etc-data/neutron/plugins/ml2/openvswitch_agent.ini:/var/lib/kolla/config_files/openvswitch_agent.ini:ro" - NeutronAgentOvsVolume: "/var/lib/etc-data/neutron/conf.d/neutron-openvswitch-agent:/etc/neutron/conf.d/neutron-openvswitch-agent:ro" + NeutronOpenvswitchAgentConfig: "/etc/neutron/neutron.conf,/etc/neutron/plugins/openvswitch/openvswitch_agent.ini" + NeutronOpenvswitchAgentPluginVolume: "/var/lib/etc-data/neutron/plugins/ml2/openvswitch_agent.ini:/var/lib/kolla/config_files/openvswitch_agent.ini:ro" + NeutronOpenvswitchAgentOvsVolume: "/var/lib/etc-data/neutron/conf.d/neutron-openvswitch-agent:/etc/neutron/conf.d/neutron-openvswitch-agent:ro" diff --git a/environments/docker.yaml b/environments/docker.yaml index 62804062..be21d842 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -17,7 +17,6 @@ parameter_defaults: 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 |