openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix ovs/netns mounts for neutron agents"

Browse Source
This commit is contained in:
Zuul 2017-12-01 05:29:18 +00:00 committed by Gerrit Code Review
commit 12361c6b39
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/services/neutron-dhcp.yaml
View File

@ -108,7 +108,7 @@ outputs:
- /var/lib/kolla/config_files/neutron_dhcp.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run/:/run
- /run/openvswitch:/run/openvswitch
- /var/lib/neutron:/var/lib/neutron
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

2
docker/services/neutron-l3.yaml
View File

@ -106,7 +106,7 @@ outputs:
- /var/lib/kolla/config_files/neutron_l3_agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /run/openvswitch:/run/openvswitch
- /var/lib/neutron:/var/lib/neutron
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

1
docker/services/neutron-metadata.yaml
View File

@ -106,7 +106,6 @@ outputs:
- /var/lib/kolla/config_files/neutron_metadata_agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /var/lib/neutron:/var/lib/neutron
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

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

@ -114,7 +114,7 @@ outputs:
- /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /run/openvswitch:/run/openvswitch
- /etc/puppet:/etc/puppet:ro
- /usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro
- /var/run/openvswitch/db.sock:/var/run/openvswitch/db.sock
@ -138,7 +138,7 @@ outputs:
- /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /run/openvswitch:/run/openvswitch
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}