X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fneutron-ovs-agent.yaml;h=27919a354f19ae8a4f3a09bc05ac78890a919dc7;hb=b87d4e1a1245dc1be512e0c7c38e052fff0c5b8b;hp=89bf8663a3238486b268ed2c19b71c6c0a576fd7;hpb=14276d79afe5b63f473dae95dceb820290eaf2cb;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml
index 89bf8663..27919a35 100644
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -13,7 +13,7 @@ parameters:
     default: 'centos-binary-neutron-openvswitch-agent:latest'
     type: string
   DockerNeutronConfigImage:
-    description: image
+    description: The container image to use for the neutron config_volume
     default: 'centos-binary-neutron-server:latest'
     type: string
   ServiceNetMap:
@@ -70,16 +70,16 @@ outputs:
           - '/'
           - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
       kolla_config:
-        /var/lib/kolla/config_files/neutron-openvswitch-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
+        /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 --config-dir /etc/neutron/conf.d/common
           permissions:
             - path: /var/log/neutron
               owner: neutron:neutron
               recurse: true
       docker_config:
         step_4:
-          neutronovsagent:
-            image: &neutron_ovs_agent_image
+          neutron_ovs_agent:
+            image:
               list_join:
               - '/'
               - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
@@ -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