Merge "Add Swift container sharder service"
This commit is contained in:
commit
b34baf9242
|
@ -57,6 +57,10 @@ parameters:
|
||||||
default: true
|
default: true
|
||||||
description: 'Use a local directory for Swift storage services when building rings'
|
description: 'Use a local directory for Swift storage services when building rings'
|
||||||
type: boolean
|
type: boolean
|
||||||
|
SwiftContainerSharderEnabled:
|
||||||
|
description: Set to True to enable Swift container sharder service
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
UpgradeRemoveUnusedPackages:
|
UpgradeRemoveUnusedPackages:
|
||||||
default: false
|
default: false
|
||||||
description: Remove package if the service is being disabled during upgrade
|
description: Remove package if the service is being disabled during upgrade
|
||||||
|
@ -64,6 +68,7 @@ parameters:
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
single_replica_mode: {equals: [{get_param: SwiftReplicas}, 1]}
|
single_replica_mode: {equals: [{get_param: SwiftReplicas}, 1]}
|
||||||
|
swift_container_sharder_enabled: {equals : [{get_param: SwiftContainerSharderEnabled}, true]}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
|
@ -159,6 +164,13 @@ outputs:
|
||||||
dest: "/"
|
dest: "/"
|
||||||
merge: true
|
merge: true
|
||||||
preserve_properties: true
|
preserve_properties: true
|
||||||
|
/var/lib/kolla/config_files/swift_container_sharder.json:
|
||||||
|
command: /usr/bin/swift-container-sharder /etc/swift/container-server.conf
|
||||||
|
config_files:
|
||||||
|
- source: "/var/lib/kolla/config_files/src/*"
|
||||||
|
dest: "/"
|
||||||
|
merge: true
|
||||||
|
preserve_properties: true
|
||||||
/var/lib/kolla/config_files/swift_object_auditor.json:
|
/var/lib/kolla/config_files/swift_object_auditor.json:
|
||||||
command: /usr/bin/swift-object-auditor /etc/swift/object-server.conf
|
command: /usr/bin/swift-object-auditor /etc/swift/object-server.conf
|
||||||
config_files:
|
config_files:
|
||||||
|
@ -292,6 +304,7 @@ outputs:
|
||||||
- /dev:/dev
|
- /dev:/dev
|
||||||
- /var/cache/swift:/var/cache/swift
|
- /var/cache/swift:/var/cache/swift
|
||||||
environment: *kolla_env
|
environment: *kolla_env
|
||||||
|
|
||||||
swift_object_auditor:
|
swift_object_auditor:
|
||||||
image: &swift_object_image {get_param: DockerSwiftObjectImage}
|
image: &swift_object_image {get_param: DockerSwiftObjectImage}
|
||||||
net: host
|
net: host
|
||||||
|
@ -450,6 +463,24 @@ outputs:
|
||||||
- /dev:/dev
|
- /dev:/dev
|
||||||
# /var/cache/swift not needed in this container
|
# /var/cache/swift not needed in this container
|
||||||
environment: *kolla_env
|
environment: *kolla_env
|
||||||
|
- if:
|
||||||
|
- swift_container_sharder_enabled
|
||||||
|
-
|
||||||
|
swift_container_sharder:
|
||||||
|
image: *swift_container_image
|
||||||
|
net: host
|
||||||
|
user: swift
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
list_concat:
|
||||||
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
|
-
|
||||||
|
- /var/lib/kolla/config_files/swift_container_sharder.json:/var/lib/kolla/config_files/config.json:ro
|
||||||
|
- /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
|
||||||
|
- /srv/node:/srv/node
|
||||||
|
- /dev:/dev
|
||||||
|
- /var/cache/swift:/var/cache/swift
|
||||||
|
- {}
|
||||||
|
|
||||||
host_prep_tasks:
|
host_prep_tasks:
|
||||||
- name: create persistent directories
|
- name: create persistent directories
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Add container for the Swift container sharder service. This service is
|
||||||
|
required for sharding containers. It is disabled by default and can be
|
||||||
|
enabled by setting the SwiftContainerSharderEnabled to true.
|
Loading…
Reference in New Issue