Merge "Move zaqar into services-docker"

[apex-tripleo-heat-templates.git] / docker / services / neutron-api.yaml

diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index 7138904..ed03de6 100644 (file)
--- 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