aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/ironic-api.yaml
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-06-23 18:21:43 +0200
committerMartin André <m.andre@redhat.com>2017-06-28 10:48:53 +0200
commita474ae82d5f157a48c997fb9df420442bd79dcbe (patch)
tree567735ea0e9dbd668b908740dc4526e99ef5a289 /docker/services/ironic-api.yaml
parent8c41b702f5b1c7baf2f2160b92067bcc0267c958 (diff)
Add heat parameter for all of config_volume images
This commit consistently defines a heat template parameter in the form of DockerXXXConfigImage where XXX represents the name of the config_volume that is used by docker-puppet. The goal is to mitigate hard to debug errors where the templates would set different defaults for the image docker-puppet.py uses to run, for the same config_volume name. This fixes a couple of inconsistencies on the way. Change-Id: I212020a76622a03521385a6cae4ce73e51ce5b6b Closes-Bug: #1699791
Diffstat (limited to 'docker/services/ironic-api.yaml')
-rw-r--r--docker/services/ironic-api.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 1c8aa5b..183ed5c 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -13,7 +13,7 @@ parameters:
default: 'centos-binary-ironic-api:latest'
type: string
DockerIronicConfigImage:
- description: image
+ description: The container image to use for the ironic config_volume
default: 'centos-binary-ironic-pxe:latest'
type: string
EndpointMap:
@@ -85,7 +85,7 @@ outputs:
# db sync runs before permissions set by kolla_config
step_2:
ironic_init_logs:
- image: &ironic_image
+ image: &ironic_api_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerIronicApiImage} ]
@@ -97,7 +97,7 @@ outputs:
step_3:
ironic_db_sync:
start_order: 1
- image: *ironic_image
+ image: *ironic_api_image
net: host
privileged: false
detach: false
@@ -112,7 +112,7 @@ outputs:
step_4:
ironic_api:
start_order: 10
- image: *ironic_image
+ image: *ironic_api_image
net: host
user: root
restart: always