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 "Fix creation of iptables rules for non-HA containerized HAproxy"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
nova-metadata.yaml
diff --git
a/docker/services/nova-metadata.yaml
b/docker/services/nova-metadata.yaml
index
95d781c
..
0a8a74c
100644
(file)
--- a/
docker/services/nova-metadata.yaml
+++ b/
docker/services/nova-metadata.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
ocata
+heat_template_version:
pike
description: >
OpenStack containerized Nova Metadata service
description: >
OpenStack containerized Nova Metadata service
@@
-9,6
+9,10
@@
parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
+ ServiceData:
+ default: {}
+ description: Dictionary packing service data
+ type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@
-25,7
+29,7
@@
parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
RoleParameters:
default: {}
description: Parameters specific to the role
-
+ type: json
resources:
resources:
@@
-33,6
+37,7
@@
resources:
type: ../../puppet/services/nova-metadata.yaml
properties:
EndpointMap: {get_param: EndpointMap}
type: ../../puppet/services/nova-metadata.yaml
properties:
EndpointMap: {get_param: EndpointMap}
+ ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}