X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fneutron-api.yaml;h=2890dec9c59f53332d3a9f3e6e3b0b4bf4226f63;hb=1b04a0f9a521b575d4438d1ee51dea588ad2f984;hp=fbdf75abbb1ee5f0e8d582d00b6dc3571daa0206;hpb=ea04e61094c65e9bf26b035aa7113128eb38f4f3;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index fbdf75ab..2890dec9 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -12,9 +12,8 @@ parameters:
     description: image
     default: 'centos-binary-neutron-server:latest'
     type: string
-  # we configure all neutron services in the same neutron
   DockerNeutronConfigImage:
-    description: image
+    description: The container image to use for the neutron config_volume
     default: 'centos-binary-neutron-server:latest'
     type: string
   EndpointMap:
@@ -83,7 +82,7 @@ outputs:
             - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/neutron_api.json:
-          command: /usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini
+          command: /usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-server
           permissions:
             - path: /var/log/neutron
               owner: neutron:neutron
@@ -92,9 +91,8 @@ outputs:
           command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         # db sync runs before permissions set by kolla_config
-        step_3:
+        step_2:
           neutron_init_logs:
-            start_order: 0
             image: &neutron_api_image
               list_join:
                 - '/'
@@ -104,8 +102,8 @@ outputs:
             volumes:
               - /var/log/containers/neutron:/var/log/neutron
             command: ['/bin/bash', '-c', 'chown -R neutron:neutron /var/log/neutron']
+        step_3:
           neutron_db_sync:
-            start_order: 1
             image: *neutron_api_image
             net: host
             privileged: false