Merge "Simplify passing config to ovs agent container"

changes/72/400972/9
Jenkins 6 years ago committed by Gerrit Code Review
commit 371f08610a
  1. 2
      docker/post.j2.yaml
  2. 9
      docker/services/neutron-ovs-agent.yaml
  3. 4
      environments/docker-network-isolation.yaml

@ -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:

@ -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

@ -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"
Loading…
Cancel
Save