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 "Make ceilometer crontab removal idempotent"
[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
b0952b1
..
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:
@@
-25,6
+25,14
@@
parameters:
DefaultPasswords:
default: {}
type: json
DefaultPasswords:
default: {}
type: json
+ RoleName:
+ default: ''
+ description: Role name on which the service is applied
+ type: string
+ RoleParameters:
+ default: {}
+ description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-39,7
+47,11
@@
resources:
NovaIronicBase:
type: ../../puppet/services/nova-ironic.yaml
properties:
NovaIronicBase:
type: ../../puppet/services/nova-ironic.yaml
properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
EndpointMap: {get_param: EndpointMap}
+ RoleName: {get_param: RoleName}
+ RoleParameters: {get_param: RoleParameters}
outputs:
role_data:
outputs:
role_data:
@@
-69,11
+81,11
@@
outputs:
recurse: true
docker_config:
step_5:
recurse: true
docker_config:
step_5:
- novacompute:
+ nova
_
compute:
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