diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-09 11:28:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-09 11:28:50 +0000 |
| commit | 2895d8d65adbc17f035425305f28a5ee0938f40d (patch) | |
| tree | d093ac63315a9a61a984875fdc627813e2e248a7 /docker/services/neutron-l3.yaml | |
| parent | e7dda1bfa332bdfb38afdc0be11b67012eacb4fc (diff) | |
| parent | af3828437e4ec92a738023afd29f12225161866e (diff) | |
Merge "Make container names consistent"
Diffstat (limited to 'docker/services/neutron-l3.yaml')
| -rw-r--r-- | docker/services/neutron-l3.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml index bd5147d3..f3a284fe 100644 --- a/docker/services/neutron-l3.yaml +++ b/docker/services/neutron-l3.yaml @@ -71,7 +71,7 @@ outputs: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ] kolla_config: - /var/lib/kolla/config_files/neutron-l3-agent.json: + /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 permissions: - path: /var/log/neutron @@ -79,7 +79,7 @@ outputs: recurse: true docker_config: step_4: - neutronl3agent: + neutron_l3_agent: image: list_join: - '/' @@ -92,7 +92,7 @@ outputs: list_concat: - {get_attr: [ContainersCommon, volumes]} - - - /var/lib/kolla/config_files/neutron-l3-agent.json:/var/lib/kolla/config_files/config.json:ro + - /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 - /lib/modules:/lib/modules:ro - /run:/run |