summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-30 21:40:38 +0000
committerGerrit Code Review <review@openstack.org>2017-06-30 21:40:38 +0000
commit5e551764f13c012aa8aeeabcbff1bda3885fcf87 (patch)
tree7a69f509b32ff8366e9f9183eea40b0fdf3f3a4b
parent42a332da1bec850caae57e75a0c06fc613f4d955 (diff)
parent630030a431a35965a0363c113a28d8493f44acef (diff)
Merge "Fix typo in config_volume"
-rw-r--r--docker/services/ec2-api.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml
index 0c65a903..d4cfe49a 100644
--- a/docker/services/ec2-api.yaml
+++ b/docker/services/ec2-api.yaml
@@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-ec2-api:latest'
type: string
DockerEc2ApiConfigImage:
- description: The container image to use for the ec2api config_volume
+ description: The container image to use for the ec2_api config_volume
default: 'centos-binary-ec2-api:latest'
type: string
EndpointMap:
@@ -64,7 +64,7 @@ outputs:
service_config_settings: {get_attr: [Ec2ApiPuppetBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:
- config_volume: ec2api
+ config_volume: ec2_api
puppet_tags: ec2api_api_paste_ini,ec2api_config
step_config: *step_config
config_image: