Disable Swift auditors/replicators on undercloud
Maintain parity with instack-undercloud Ic93082282e9ea481c13832f8ce1265a47f0ef3d5 Swift is using only a single replica on the undercloud. Therefore recovering from a corrupted or lost object is not possible, and running replicators and auditors only wastes resources. And may create some trouble. For example, the DB replicators and auditors will lock the DB, and new objects won't be stored during that time. Related-Bug: #1632885 Closes-Bug: #1797167 Change-Id: I584cdb03b99721fbdc28bf7f6019d914586341d2 Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya
parent
ad06ebce20
commit
47f93e1792
@ -49,6 +49,10 @@ parameters:
|
||||
default: {}
|
||||
description: 'A hash of additional raw devices to use as Swift backend (eg. {sdb: {}})'
|
||||
type: json
|
||||
SwiftReplicas:
|
||||
type: number
|
||||
default: 3
|
||||
description: How many replicas to use in the swift rings.
|
||||
SwiftUseLocalDir:
|
||||
default: true
|
||||
description: 'Use a local directory for Swift storage services when building rings'
|
||||
@ -58,6 +62,9 @@ parameters:
|
||||
description: Remove package if the service is being disabled during upgrade
|
||||
type: boolean
|
||||
|
||||
conditions:
|
||||
single_replica_mode: {equals: [{get_param: SwiftReplicas}, 1]}
|
||||
|
||||
resources:
|
||||
|
||||
ContainersCommon:
|
||||
@ -218,6 +225,11 @@ outputs:
|
||||
volumes:
|
||||
- /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:rw,z
|
||||
step_4:
|
||||
map_merge:
|
||||
- if:
|
||||
- single_replica_mode
|
||||
- {}
|
||||
-
|
||||
swift_account_auditor:
|
||||
image: *swift_account_image
|
||||
net: host
|
||||
@ -234,21 +246,6 @@ outputs:
|
||||
- /var/cache/swift:/var/cache/swift:z
|
||||
environment: &kolla_env
|
||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||
swift_account_reaper:
|
||||
image: *swift_account_image
|
||||
net: host
|
||||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/swift_account_reaper.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:z
|
||||
- /dev:/dev
|
||||
- /var/cache/swift:/var/cache/swift:z
|
||||
environment: *kolla_env
|
||||
swift_account_replicator:
|
||||
image: *swift_account_image
|
||||
net: host
|
||||
@ -264,23 +261,6 @@ outputs:
|
||||
- /dev:/dev
|
||||
- /var/cache/swift:/var/cache/swift
|
||||
environment: *kolla_env
|
||||
swift_account_server:
|
||||
image: *swift_account_image
|
||||
net: host
|
||||
user: swift
|
||||
restart: always
|
||||
healthcheck:
|
||||
test: /openstack/healthcheck
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/swift_account_server.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
|
||||
environment: *kolla_env
|
||||
swift_container_auditor:
|
||||
image: &swift_container_image {get_param: DockerSwiftContainerImage}
|
||||
net: host
|
||||
@ -311,6 +291,69 @@ outputs:
|
||||
- /dev:/dev
|
||||
- /var/cache/swift:/var/cache/swift
|
||||
environment: *kolla_env
|
||||
swift_object_auditor:
|
||||
image: &swift_object_image {get_param: DockerSwiftObjectImage}
|
||||
net: host
|
||||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/swift_object_auditor.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
|
||||
environment: *kolla_env
|
||||
swift_object_replicator:
|
||||
image: *swift_object_image
|
||||
net: host
|
||||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/swift_object_replicator.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
|
||||
environment: *kolla_env
|
||||
-
|
||||
swift_account_reaper:
|
||||
image: *swift_account_image
|
||||
net: host
|
||||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/swift_account_reaper.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:z
|
||||
- /dev:/dev
|
||||
- /var/cache/swift:/var/cache/swift:z
|
||||
environment: *kolla_env
|
||||
swift_account_server:
|
||||
image: *swift_account_image
|
||||
net: host
|
||||
user: swift
|
||||
restart: always
|
||||
healthcheck:
|
||||
test: /openstack/healthcheck
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/swift_account_server.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
|
||||
environment: *kolla_env
|
||||
swift_container_updater:
|
||||
image: *swift_container_image
|
||||
net: host
|
||||
@ -343,21 +386,6 @@ outputs:
|
||||
- /dev:/dev
|
||||
- /var/cache/swift:/var/cache/swift
|
||||
environment: *kolla_env
|
||||
swift_object_auditor:
|
||||
image: &swift_object_image {get_param: DockerSwiftObjectImage}
|
||||
net: host
|
||||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/swift_object_auditor.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
|
||||
environment: *kolla_env
|
||||
swift_object_expirer:
|
||||
image: &swift_proxy_image {get_param: DockerSwiftProxyImage}
|
||||
net: host
|
||||
@ -373,21 +401,6 @@ outputs:
|
||||
- /dev:/dev
|
||||
- /var/cache/swift:/var/cache/swift
|
||||
environment: *kolla_env
|
||||
swift_object_replicator:
|
||||
image: *swift_object_image
|
||||
net: host
|
||||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/swift_object_replicator.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
|
||||
environment: *kolla_env
|
||||
swift_object_updater:
|
||||
image: *swift_object_image
|
||||
net: host
|
||||
|
||||
@ -119,6 +119,7 @@ parameter_defaults:
|
||||
NeutronVniRanges: '10:100'
|
||||
NeutronPortQuota: '-1'
|
||||
SwiftCorsAllowedOrigin: '*'
|
||||
SwiftReplicas: 1
|
||||
# A list of static routes for the control plane network. Ensure traffic to
|
||||
# nodes on remote control plane networks use the correct network path.
|
||||
# Example:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user