X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fneutron-api.yaml;h=ed03de6c4736ff84fbfa0ddd14dc802af7db4708;hb=8dd96ee8a71313a2cea3459a5ca0366b8260b1d7;hp=e444f391ade9be15fb83e6c44fe30e8ef226e515;hpb=7b2da488f51fc5b891b5831b54699ca412c5a09c;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index e444f391..ed03de6c 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -49,19 +49,18 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
-      step_config: {get_attr: [NeutronBase, role_data, step_config]}
+      step_config: &step_config
+        get_attr: [NeutronBase, role_data, step_config]
       service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
-      docker_image: &neutron_api_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNeutronApiImage} ]
-      puppet_tags: neutron_config,neutron_api_config
-      config_volume: neutron
-      config_image:
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
+      puppet_config:
+        config_volume: neutron
+        puppet_tags: neutron_config,neutron_api_config
+        step_config: *step_config
+        config_image:
+          list_join:
+            - '/'
+            - [ {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-dir /usr/share/neutron/server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini
@@ -77,10 +76,16 @@ outputs:
       docker_config:
         step_3:
           neutron_db_sync:
-            image: *neutron_api_image
+            image: &neutron_api_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerNeutronApiImage} ]
             net: host
             privileged: false
             detach: false
+            # FIXME: we should make config file permissions right
+            # and run as neutron user
+            user: root
             volumes:
               - /var/lib/config-data/neutron/etc/neutron:/etc/neutron:ro
               - /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron:ro
@@ -100,3 +105,7 @@ outputs:
               - /etc/localtime:/etc/localtime:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable neutron_api service
+          tags: step2
+          service: name=neutron-server state=stopped enabled=no