diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-29 20:12:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-29 20:12:59 +0000 |
| commit | e8d8eae59cf7fac1378ddb6dc78c847abb77c22f (patch) | |
| tree | 2290212e2b6f529824dc499badfba578a892421b /docker/services/ec2-api.yaml | |
| parent | 3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (diff) | |
| parent | a474ae82d5f157a48c997fb9df420442bd79dcbe (diff) | |
Merge "Add heat parameter for all of config_volume images"
Diffstat (limited to 'docker/services/ec2-api.yaml')
| -rw-r--r-- | docker/services/ec2-api.yaml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml index bc3654b0..0c65a903 100644 --- 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: |