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
d795818
..
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}
@@
-188,8
+193,8
@@
outputs:
- path: /var/log/swift
owner: swift:swift
recurse: true
- path: /var/log/swift
owner: swift:swift
recurse: true
- /var/lib/kolla/config_files/swift_
xinetd_
rsync.json:
- command: /usr/
sbin/xinetd -dontfork
+ /var/lib/kolla/config_files/swift_rsync.json:
+ command: /usr/
bin/rsync --daemon --no-detach --config=/etc/rsyncd.conf
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
@@
-428,7
+433,7
@@
outputs:
- /dev:/dev
- /var/log/containers/swift:/var/log/swift
environment: *kolla_env
- /dev:/dev
- /var/log/containers/swift:/var/log/swift
environment: *kolla_env
- swift_
xinetd_
rsync:
+ swift_rsync:
image: *swift_object_image
net: host
user: root
image: *swift_object_image
net: host
user: root
@@
-438,7
+443,7
@@
outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/lib/kolla/config_files/swift_
xinetd_
rsync.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/kolla/config_files/swift_rsync.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
- /run:/run
- /srv/node:/srv/node
- /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
- /run:/run
- /srv/node:/srv/node