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 "Adds network/cidr mapping into a new service property"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
swift-storage.yaml
diff --git
a/docker/services/swift-storage.yaml
b/docker/services/swift-storage.yaml
index
a07c92a
..
76e38f6
100644
(file)
--- a/
docker/services/swift-storage.yaml
+++ b/
docker/services/swift-storage.yaml
@@
-44,6
+44,10
@@
parameters:
default: {}
description: Parameters specific to the role
type: json
default: {}
description: Parameters specific to the role
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
@@
-65,6
+69,7
@@
resources:
type: ../../puppet/services/swift-storage.yaml
properties:
EndpointMap: {get_param: EndpointMap}
type: ../../puppet/services/swift-storage.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}