aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/nova-conductor.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-21 09:46:11 +0000
committerGerrit Code Review <review@openstack.org>2017-03-21 09:46:11 +0000
commit76e34cfa2b252f314a06c27d75cfe2bc997206c2 (patch)
tree99150c348ee52cf061d13ac7e6071d94c6c7d994 /docker/services/nova-conductor.yaml
parent430556b373b8611dad415528721e59f18b6f6f12 (diff)
parent1f018babcf4daca989758c2462b27e4137a9cd0f (diff)
Merge "Cleanup docker services templates"
Diffstat (limited to 'docker/services/nova-conductor.yaml')
-rw-r--r--docker/services/nova-conductor.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml
index 09a6d0f6..f85cf546 100644
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@@ -12,7 +12,7 @@ parameters:
description: image
default: 'centos-binary-nova-conductor:latest'
type: string
- DockerNovaBaseImage:
+ DockerNovaConfigImage:
description: image
default: 'centos-binary-nova-base:latest'
type: string
@@ -58,7 +58,7 @@ outputs:
config_image:
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaBaseImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/nova_conductor.json:
command: /usr/bin/nova-conductor