diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-15 06:19:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-15 06:19:13 +0000 |
| commit | 2185b835602ffb276b8142db68d472611fdf127a (patch) | |
| tree | 50c351054ae33f3750e2a3a0a218432ddc6dcf02 /docker/services/ec2-api.yaml | |
| parent | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (diff) | |
| parent | e76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (diff) | |
Merge "Use a single configuration file for specifying docker containers."
Diffstat (limited to 'docker/services/ec2-api.yaml')
| -rw-r--r-- | docker/services/ec2-api.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml index 607d76c7..9f1ecbc1 100644 --- a/docker/services/ec2-api.yaml +++ b/docker/services/ec2-api.yaml @@ -4,17 +4,11 @@ description: > OpenStack containerized EC2 API service parameters: - DockerNamespace: - description: namespace - default: 'tripleoupstream' - type: string DockerEc2ApiImage: description: image - default: 'centos-binary-ec2-api:latest' type: string DockerEc2ApiConfigImage: description: The container image to use for the ec2_api config_volume - default: 'centos-binary-ec2-api:latest' type: string EndpointMap: default: {} @@ -71,10 +65,7 @@ outputs: config_volume: ec2_api puppet_tags: ec2api_api_paste_ini,ec2api_config step_config: *step_config - config_image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerEc2ApiConfigImage} ] + config_image: {get_param: DockerEc2ApiConfigImage} kolla_config: /var/lib/kolla/config_files/ec2_api.json: command: /usr/bin/ec2-api @@ -102,10 +93,7 @@ outputs: # db sync runs before permissions set by kolla_config step_2: ec2_api_init_logs: - image: &ec2_api_image - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerEc2ApiImage} ] + image: &ec2_api_image {get_param: DockerEc2ApiImage} privileged: false user: root volumes: |