diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-10 17:20:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-10 17:20:09 +0000 |
| commit | 322f2dbd4c1d9c8617186bcb9211d7a1fe10ba3f (patch) | |
| tree | c0714854a4d02dfb8d74a2d48f5959ee89adf028 /docker/services/neutron-l3.yaml | |
| parent | 83defdbdbf12a4ba9d843cd115d1acb931d1d151 (diff) | |
| parent | cf18e865d14adc319b6c2dfafd650f32dad4d853 (diff) | |
Merge "Copy only generated puppet files into the container"
Diffstat (limited to 'docker/services/neutron-l3.yaml')
| -rw-r--r-- | docker/services/neutron-l3.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml index b692f736..1db48b3b 100644 --- a/docker/services/neutron-l3.yaml +++ b/docker/services/neutron-l3.yaml @@ -72,6 +72,11 @@ outputs: kolla_config: /var/lib/kolla/config_files/neutron_l3_agent.json: command: /usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true permissions: - path: /var/log/neutron owner: neutron:neutron @@ -92,7 +97,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/neutron_l3_agent.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro + - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro - /lib/modules:/lib/modules:ro - /run:/run - /var/log/containers/neutron:/var/log/neutron |