Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add sample usage of StorageMgmt network for compute nodes"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
nova-ironic.yaml
diff --git
a/docker/services/nova-ironic.yaml
b/docker/services/nova-ironic.yaml
index
63780fe
..
8f98839
100644
(file)
--- a/
docker/services/nova-ironic.yaml
+++ b/
docker/services/nova-ironic.yaml
@@
-8,12
+8,12
@@
parameters:
description: namespace
default: 'tripleoupstream'
type: string
description: namespace
default: 'tripleoupstream'
type: string
- DockerNovaComputeImage:
+ DockerNovaComputeI
ronicI
mage:
description: image
default: 'centos-binary-nova-compute-ironic:latest'
type: string
DockerNovaConfigImage:
description: image
default: 'centos-binary-nova-compute-ironic:latest'
type: string
DockerNovaConfigImage:
- description:
imag
e
+ description:
The container image to use for the nova config_volum
e
default: 'centos-binary-nova-base:latest'
type: string
ServiceNetMap:
default: 'centos-binary-nova-base:latest'
type: string
ServiceNetMap:
@@
-85,7
+85,7
@@
outputs:
image:
list_join:
- '/'
image:
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeI
ronicI
mage} ]
net: host
privileged: true
user: root
net: host
privileged: true
user: root