Skip to content

Commit b548c09

Browse files
authored
Merge pull request #624 from chaen/tmp_installation_docs
installation docs
2 parents 5f6f2f2 + 85636cc commit b548c09

8 files changed

Lines changed: 22 additions & 11 deletions

File tree

diracx-cli/src/diracx/cli/internal/legacy.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ def generate_helm_values(
211211
},
212212
"rabbitmq": {"enabled": False},
213213
"mysql": {"enabled": False},
214-
"global": {"images": {"services": "FILL ME"}, "storageClassName": "FILL ME"},
215214
}
216215

217216
cfg = diraccfg.CFG().loadFromBuffer(public_cfg.read_text())
@@ -265,7 +264,7 @@ def generate_helm_values(
265264

266265
from diracx.core.extensions import select_from_extension
267266

268-
for entry_point in select_from_extension(group="diracx.db.sql"):
267+
for entry_point in select_from_extension(group="diracx.dbs.sql"):
269268
db_name = entry_point.name
270269
db_config = all_db_configs.get(db_name, {})
271270

@@ -311,7 +310,7 @@ def generate_helm_values(
311310
},
312311
}
313312

314-
for entry_point in select_from_extension(group="diracx.db.os"):
313+
for entry_point in select_from_extension(group="diracx.dbs.os"):
315314
db_name = entry_point.name
316315
db_config = all_db_configs.get(db_name, {})
317316

docs/admin/explanations/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ We foresee this will continue to be the case until the migration from DIRAC -> D
2929
During this time, the DiracX configuration is not intended to be edited directly.
3030
The DiracX `default.yml` file differs in structure and contents from the legacy DIRAC Configuration Service.
3131

32-
See [how-to](../how-to/convert-cs.md) for how to convert.
32+
See [how-to](../how-to/install/convert-cs.md) for how to convert.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SandboxStore
2+
3+
TODO: https://github.com/DIRACGrid/diracx/issues/13
4+
5+
sds
File renamed without changes.

docs/admin/how-to/register-a-vo.md renamed to docs/admin/how-to/install/register-a-vo.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@
7070
User IDs are associated to the usernames that are defined in the `Registry > Users` section. This allows DiracX to retrieve the groups they belong to and their properties.
7171
7272
After saving, you should sync the configuration with DiracX. Dirac Groups and properties should then be associated to users defined in the `DiracX` section.
73-
See [Convert CS](./convert-cs.md) for next steps.
73+
See the previous step [Convert CS](./convert-cs.md) for a refresher.
74+
75+
### Automatic population of the UserSubjects
76+
77+
The `DIRAC VOMS2CSAgent` can populate this list for you from an `IAM` server. For that you need to enable the `UseIAM` flag to True.
7478
7579
## Interact with Computing Elements
7680
File renamed without changes.

docs/dev/explanations/components/db.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Databases
22

33
TODO: review
4+
TODO: add transactions info
45

56
The primary store of operational data in DiracX is in SQL databases managed through SQLAlchemy.
67
In addition, DiracX utilizes OpenSearch (or Elasticsearch) for storing pilot logs, medium-term metadata about jobs and pilots ("Job Parameters" and "Pilot Parameters"), and optionally, for OpenTelemetry data.

mkdocs.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,21 @@ nav:
7070
- Tutorials:
7171
- Run locally: admin/tutorials/run_locally.md
7272
- How-To:
73-
- Install kubernetes: admin/how-to/install-kubernetes.md
74-
- Installing: admin/how-to/installing.md
75-
- Convert CS: admin/how-to/convert-cs.md
76-
- Register a VO: admin/how-to/register-a-vo.md
77-
- Register the admin VO: admin/how-to/register-the-admin-vo.md
73+
- install:
74+
- Install kubernetes: admin/how-to/install/install-kubernetes.md
75+
- Installing DiracX: admin/how-to/install/installing.md
76+
- Convert CS: admin/how-to/install/convert-cs.md
77+
- Register a VO: admin/how-to/install/register-a-vo.md
78+
- Register the admin VO: admin/how-to/install/register-the-admin-vo.md
7879
- Debugging: admin/how-to/debugging.md
7980
- Upgrading: admin/how-to/upgrading.md
8081
- Rotate a secret: admin/how-to/rotate-a-secret.md
8182
- Explanations:
8283
- Configuration: admin/explanations/configuration.md
8384
- OpenTelemetry: admin/explanations/opentelemetry.md
8485
- Chart structure: admin/explanations/chart-structure.md
85-
- Databases: docs/admin/explanations/database-management.md
86+
- Databases: admin/explanations/database-management.md
87+
- Sandbox Store: admin/explanations/sandbox-store.md
8688
- Reference:
8789
- Security Model: admin/reference/security_model.md
8890
- Charts values: admin/reference/values.md

0 commit comments

Comments
 (0)