openstack/tripleo-heat-templates
Code Issues Proposed changes

Simplify passing config to ovs agent container

Browse Source 
The mechanism to pass config files to the neutron-ovs-agent container
was overly complex and not at all justified. This commit removes a few
useless parameters and aligns the neutron-ovs-agents with the rest of
the containers.

Change-Id: Ib9a5985ac9d098731c2fb798d6c9e03cba4b87dd
This commit is contained in:
Martin André 2017-01-13 16:55:54 +01:00
parent 2e3ff0a673
commit 4320ee55ba
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/post.j2.yaml
View File

@ -35,7 +35,7 @@ parameters:
NeutronOpenvswitchAgentConfig:
type: string
default: "/etc/neutron/neutron.conf,/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
default: "/etc/neutron/neutron.conf,/etc/neutron/plugins/ml2/openvswitch_agent.ini"
resources:

9
docker/services/neutron-ovs-agent.yaml
View File

@ -12,12 +12,6 @@ parameters:
description: image
default: 'centos-binary-neutron-openvswitch-agent'
type: string
NeutronOpenvswitchAgentPluginVolume:
type: string
default: "/var/lib/etc-data/neutron/plugins/ml2/openvswitch_agent.ini:/var/lib/kolla/config_files/ovs_neutron_plugin.ini:ro"
NeutronOpenvswitchAgentOvsVolume:
type: string
default: " "
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@ -64,8 +58,7 @@ outputs:
- /var/lib/etc-data/json-config/neutron-openvswitch-agent.json:/var/lib/kolla/config_files/config.json
- /var/lib/etc-data/neutron/neutron.conf:/var/lib/kolla/config_files/neutron.conf:ro
- /var/lib/etc-data/neutron/plugins/ml2/ml2_conf.ini:/var/lib/kolla/config_files/ml2_conf.ini:ro
- {get_param: NeutronOpenvswitchAgentPluginVolume}
- {get_param: NeutronOpenvswitchAgentOvsVolume}
- /var/lib/etc-data/neutron/plugins/ml2/openvswitch_agent.ini:/var/lib/kolla/config_files/openvswitch_agent.ini:ro
- /etc/localtime:/etc/localtime:ro
- /lib/modules:/lib/modules:ro
- /run:/run

4
environments/docker-network-isolation.yaml
View File

@ -1,4 +0,0 @@
parameter_defaults:
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"