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 "Revert "Specify cell0 db creation""
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
nova-ironic.yaml
diff --git
a/puppet/services/nova-ironic.yaml
b/puppet/services/nova-ironic.yaml
index
4d01bbe
..
306c6b6
100644
(file)
--- a/
puppet/services/nova-ironic.yaml
+++ b/
puppet/services/nova-ironic.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
OpenStack Nova Compute service configured with Puppet and using Ironic
description: >
OpenStack Nova Compute service configured with Puppet and using Ironic
@@
-10,6
+10,9
@@
parameters:
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
+ DefaultPasswords:
+ default: {}
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-25,6
+28,7
@@
resources:
type: ./nova-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
type: ./nova-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
EndpointMap: {get_param: EndpointMap}
outputs: