diff options
| author |   Martin André <m.andre@redhat.com> | 2017-01-13 16:55:54 +0100 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2017-01-17 13:12:29 +0100 |
| commit | 4320ee55ba4fd619739c8daf24c14d97dd3c292d (patch) | |
| tree | c395fd97e74f03617cee49951fb5d70897da3433 /docker/services | |
| parent | 2e3ff0a6734bce712ab11f37a9dc2454f1420d76 (diff) | |
Simplify passing config to ovs agent container
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
Diffstat (limited to 'docker/services')
| -rw-r--r-- | docker/services/neutron-ovs-agent.yaml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 56bd073e..1c9e60db 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -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 |