Skip to content

Commit e6a1b7a

Browse files
committed
CLDSRV-825: remove Ceph runtime support and capability flags
Drop Ceph CI artifacts and location config, remove Ceph-specific runtime defaults, and update reported capability flags and related unit coverage to match supported backends.
1 parent c275bac commit e6a1b7a

File tree

8 files changed

+2
-369
lines changed

8 files changed

+2
-369
lines changed

.github/ceph/Dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/ceph/entrypoint-wrapper.sh

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/ceph/wait_for_ceph.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/docker/docker-compose.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,8 @@ services:
9191
image: ${KMS_IMAGE:-nsmithuk/local-kms:3.11.7}
9292
mongo:
9393
network_mode: "host"
94-
profiles: ['mongo', 'ceph']
94+
profiles: ['mongo']
9595
image: ${MONGODB_IMAGE}
96-
ceph:
97-
network_mode: "host"
98-
profiles: ['ceph']
99-
image: ghcr.io/scality/cloudserver/ci-ceph
100-
volumes:
101-
- /tmp/artifacts/${JOB_NAME}/ceph:/artifacts
10296
sproxyd:
10397
network_mode: "host"
10498
profiles: ['sproxyd']

lib/Config.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,7 @@ function locationConstraintAssert(locationConstraints) {
387387
assert(locationConstraints[l].isCold === true);
388388
}
389389

390-
if (process.env.CI_CEPH === 'true') {
391-
// eslint-disable-next-line no-param-reassign
392-
locationConstraints[l].details.https = false;
393-
} else if (details.https !== undefined) {
390+
if (details.https !== undefined) {
394391
assert(typeof details.https === 'boolean', 'bad config: ' +
395392
'locationConstraints[region].details https must be a boolean');
396393
} else {
@@ -401,9 +398,6 @@ function locationConstraintAssert(locationConstraints) {
401398
if (details.pathStyle !== undefined) {
402399
assert(typeof details.pathStyle === 'boolean', 'bad config: ' +
403400
'locationConstraints[region].pathStyle must be a boolean');
404-
} else if (process.env.CI_CEPH === 'true') {
405-
// eslint-disable-next-line no-param-reassign
406-
locationConstraints[l].details.pathStyle = true;
407401
} else {
408402
// eslint-disable-next-line no-param-reassign
409403
locationConstraints[l].details.pathStyle = false;

lib/utilities/reportHandler.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ function getCapabilities(cfg = config) {
4444
locationTypeS3Custom: true,
4545
locationTypeSproxyd: true,
4646
locationTypeNFS: true,
47-
locationTypeCephRadosGW: true,
4847
locationTypeHyperdriveV2: true,
4948
locationTypeLocal: true,
5049
preferredReadLocation: true,
@@ -53,7 +52,6 @@ function getCapabilities(cfg = config) {
5352
secureChannelOptimizedPath: true,
5453
s3cIngestLocation: true,
5554
nfsIngestLocation: false,
56-
cephIngestLocation: false,
5755
awsIngestLocation: false,
5856
};
5957

@@ -72,7 +70,6 @@ function getCapabilities(cfg = config) {
7270
caps.locationTypeDigitalOcean &&= cfg.supportedLocationTypes.has('location-do-spaces-v1');
7371
caps.locationTypeSproxyd &&= cfg.supportedLocationTypes.has('location-scality-sproxyd-v1');
7472
caps.locationTypeNFS &&= cfg.supportedLocationTypes.has('location-nfs-mount-v1');
75-
caps.locationTypeCephRadosGW &&= cfg.supportedLocationTypes.has('location-ceph-radosgw-s3-v1');
7673
caps.locationTypeHyperdriveV2 &&= cfg.supportedLocationTypes.has('location-scality-hdclient-v2');
7774
caps.locationTypeLocal &&= cfg.supportedLocationTypes.has('location-file-v1');
7875
}

0 commit comments

Comments
 (0)