summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorRyan Hallisey <rhallise@redhat.com>2016-03-03 15:33:36 +0000
committerRyan Hallisey <rhallise@redhat.com>2016-03-09 16:23:07 +0000
commita0b9dacf95d7d31f409dbd507b57a782ecb313e2 (patch)
treecc4400dae72c2e178186f68b1466f44e366c7761 /environments
parent41a333f8743432ba85147ca3070d690a69ec4781 (diff)
Remove unused Neutron Agents container
The Neutron Agents is currently not used. Refactor the heat templates to accommodate for this change. Change-Id: Ice3c5ce723fa16cfb66c2b0afbe51d7b282c3210
Diffstat (limited to 'environments')
-rw-r--r--environments/docker-network-isolation.yaml6
-rw-r--r--environments/docker.yaml1
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 7c6dc407..db0e6ef4 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -16,7 +16,6 @@ parameter_defaults:
DockerComputeImage: centos-binary-nova-compute: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