From 6839f47c35dcab20082a653cbf0927a609cdc00a Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Tue, 23 Dec 2025 16:13:53 +0000 Subject: [PATCH] Changed defaults to work for our Ceph deploy --- docs/tech-specs/minio-to-s3-migration.md | 20 +++++++++---------- .../trustgraph/librarian/service.py | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/tech-specs/minio-to-s3-migration.md b/docs/tech-specs/minio-to-s3-migration.md index cfa1c364..2a57e469 100644 --- a/docs/tech-specs/minio-to-s3-migration.md +++ b/docs/tech-specs/minio-to-s3-migration.md @@ -36,8 +36,8 @@ The Librarian service uses S3-compatible object storage for document blob storag The implementation works with any S3-compatible object storage system: ### Tested/Supported -- **MinIO** - Lightweight self-hosted object storage (default configuration) -- **Ceph RADOS Gateway (RGW)** - Distributed storage system with S3 API +- **Ceph RADOS Gateway (RGW)** - Distributed storage system with S3 API (default configuration) +- **MinIO** - Lightweight self-hosted object storage ### Should Work (S3-Compatible) - **AWS S3** - Amazon's cloud object storage @@ -68,20 +68,20 @@ OBJECT_STORE_SECRET_KEY= ### Examples -**MinIO (default):** +**Ceph RADOS Gateway (default):** +```bash +--object-store-endpoint http://ceph-rgw:7480 \ +--object-store-access-key object-user \ +--object-store-secret-key object-password +``` + +**MinIO:** ```bash --object-store-endpoint minio:9000 \ --object-store-access-key minioadmin \ --object-store-secret-key minioadmin ``` -**Ceph RADOS Gateway:** -```bash ---object-store-endpoint ceph-rgw.example.com:8080 \ ---object-store-access-key user123 \ ---object-store-secret-key abcd1234secret -``` - **AWS S3:** ```bash --object-store-endpoint s3.amazonaws.com \ diff --git a/trustgraph-flow/trustgraph/librarian/service.py b/trustgraph-flow/trustgraph/librarian/service.py index 26d02570..5b68f376 100755 --- a/trustgraph-flow/trustgraph/librarian/service.py +++ b/trustgraph-flow/trustgraph/librarian/service.py @@ -41,9 +41,9 @@ default_collection_response_queue = collection_response_queue default_config_request_queue = config_request_queue default_config_response_queue = config_response_queue -default_object_store_endpoint = "minio:9000" -default_object_store_access_key = "minioadmin" -default_object_store_secret_key = "minioadmin" +default_object_store_endpoint = "http://ceph-rgw:7480" +default_object_store_access_key = "object-user" +default_object_store_secret_key = "object-password" default_cassandra_host = "cassandra" bucket_name = "library" @@ -501,14 +501,14 @@ class Processor(AsyncProcessor): parser.add_argument( '--object-store-access-key', - default='minioadmin', + default=default_object_store_access_key, help='Object storage access key / username ' f'(default: {default_object_store_access_key})', ) parser.add_argument( '--object-store-secret-key', - default='minioadmin', + default=default_object_store_secret_key, help='Object storage secret key / password ' f'(default: {default_object_store_secret_key})', )