Merge "Add release note for generated sample environments"

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

diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml
index bc3654b..0c65a90 100644 (file)
--- a/docker/services/ec2-api.yaml
+++ b/docker/services/ec2-api.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-ec2-api:latest'
     type: string
+  DockerEc2ApiConfigImage:
+    description: The container image to use for the ec2api config_volume
+    default: 'centos-binary-ec2-api:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -63,10 +67,10 @@ outputs:
         config_volume: ec2api
         puppet_tags: ec2api_api_paste_ini,ec2api_config
         step_config: *step_config
-        config_image: &ec2_api_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerEc2ApiImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerEc2ApiConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/ec2_api.json:
           command: /usr/bin/ec2-api
@@ -84,7 +88,10 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           ec2_api_init_logs:
-            image: *ec2_api_image
+            image: &ec2_api_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerEc2ApiImage} ]
             privileged: false
             user: root
             volumes: