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

diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index bf19586c..ed03de6c 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -53,10 +53,6 @@ outputs:
         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_config:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_api_config
@@ -80,7 +76,10 @@ 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
@@ -106,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