aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/neutron-ovs-agent.yaml
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-06-07 15:35:55 +0200
committerMartin André <m.andre@redhat.com>2017-06-09 09:04:44 +0200
commitaf3828437e4ec92a738023afd29f12225161866e (patch)
tree7ca0f1380dbf48929391de197c4760c8bcdb8d6b /docker/services/neutron-ovs-agent.yaml
parent753d0f9aceb697fa37729cb6af12ecb7dc8b7f23 (diff)
Make container names consistent
This commit change the container names to consistently use the `_` char as a word separator and make the kolla external config file match the container name to make operators' life easier. Change-Id: Ibac9d76dde474b94c3cb86031ead0fd0327e126f
Diffstat (limited to 'docker/services/neutron-ovs-agent.yaml')
-rw-r--r--docker/services/neutron-ovs-agent.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml
index 89bf8663..65ad21ed 100644
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -70,7 +70,7 @@ outputs:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
kolla_config:
- /var/lib/kolla/config_files/neutron-openvswitch-agent.json:
+ /var/lib/kolla/config_files/neutron_ovs_agent.json:
command: /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
permissions:
- path: /var/log/neutron
@@ -78,7 +78,7 @@ outputs:
recurse: true
docker_config:
step_4:
- neutronovsagent:
+ neutron_ovs_agent:
image: &neutron_ovs_agent_image
list_join:
- '/'
@@ -91,7 +91,7 @@ outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/lib/kolla/config_files/neutron-openvswitch-agent.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/kolla/config_files/neutron_ovs_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