From e6e0797e49aa2106ce057c1f0889b1c4ab0c18ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarom=C3=ADr=20Hradil?= <jaromir.hradil@cesnet.cz> Date: Fri, 25 Oct 2024 12:45:27 +0200 Subject: [PATCH] Separating accounting configs --- .../accounting-config-production.yaml | 14 ++++++++++++++ ...ng-config.yaml => accounting-config-stage.yaml} | 0 .../accounting_deployments/accounting-config.yaml | 2 +- .../accounting_deployments/accounting-config.yaml | 2 +- .../accounting_deployments/accounting-config.yaml | 2 +- .../accounting_deployments/accounting-config.yaml | 2 +- .../accounting_deployments/accounting-config.yaml | 2 +- 7 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 common/accounting_deployments/accounting-config-production.yaml rename common/accounting_deployments/{accounting-config.yaml => accounting-config-stage.yaml} (100%) diff --git a/common/accounting_deployments/accounting-config-production.yaml b/common/accounting_deployments/accounting-config-production.yaml new file mode 100644 index 0000000..2fd0e04 --- /dev/null +++ b/common/accounting_deployments/accounting-config-production.yaml @@ -0,0 +1,14 @@ +eosc: + schedule: 42 1 * * * + tokenUrl: "https://{{ secrets['checkin_host'] }}/OIDC/token" + clientId: "{{ secrets['client_id'] }}" + clientSecret: "{{ secrets['client_secret'] }}" + accountingUrl: "https://{{ secrets['accounting_host'] }}" + installationId: "{{ secrets['accounting_install_id'] }}" + flavorMetrics: + small-environment-2-vcpu-4-gb-ram: 66cc83f65c191f76bc9dc6ed + medium-environment-4-vcpu-8-gb-ram: 66cc84190224445bec163975 + large-environment-8-vcpu-16-gb-ram-gpu: 66cc84266ea4014534e682d7 + large-environment-8-vcpu-16-gb-ram: 66cc84386ea4014534e682d8 + + diff --git a/common/accounting_deployments/accounting-config.yaml b/common/accounting_deployments/accounting-config-stage.yaml similarity index 100% rename from common/accounting_deployments/accounting-config.yaml rename to common/accounting_deployments/accounting-config-stage.yaml diff --git a/production1/accounting_deployments/accounting-config.yaml b/production1/accounting_deployments/accounting-config.yaml index c064841..6f03457 120000 --- a/production1/accounting_deployments/accounting-config.yaml +++ b/production1/accounting_deployments/accounting-config.yaml @@ -1 +1 @@ -../../common/accounting_deployments/accounting-config.yaml \ No newline at end of file +../../common/accounting_deployments/accounting-config-production.yaml \ No newline at end of file diff --git a/production2/accounting_deployments/accounting-config.yaml b/production2/accounting_deployments/accounting-config.yaml index c064841..6f03457 120000 --- a/production2/accounting_deployments/accounting-config.yaml +++ b/production2/accounting_deployments/accounting-config.yaml @@ -1 +1 @@ -../../common/accounting_deployments/accounting-config.yaml \ No newline at end of file +../../common/accounting_deployments/accounting-config-production.yaml \ No newline at end of file diff --git a/staging1/accounting_deployments/accounting-config.yaml b/staging1/accounting_deployments/accounting-config.yaml index c064841..62866e9 120000 --- a/staging1/accounting_deployments/accounting-config.yaml +++ b/staging1/accounting_deployments/accounting-config.yaml @@ -1 +1 @@ -../../common/accounting_deployments/accounting-config.yaml \ No newline at end of file +../../common/accounting_deployments/accounting-config-stage.yaml \ No newline at end of file diff --git a/staging2/accounting_deployments/accounting-config.yaml b/staging2/accounting_deployments/accounting-config.yaml index c064841..62866e9 120000 --- a/staging2/accounting_deployments/accounting-config.yaml +++ b/staging2/accounting_deployments/accounting-config.yaml @@ -1 +1 @@ -../../common/accounting_deployments/accounting-config.yaml \ No newline at end of file +../../common/accounting_deployments/accounting-config-stage.yaml \ No newline at end of file diff --git a/testing/accounting_deployments/accounting-config.yaml b/testing/accounting_deployments/accounting-config.yaml index c064841..62866e9 120000 --- a/testing/accounting_deployments/accounting-config.yaml +++ b/testing/accounting_deployments/accounting-config.yaml @@ -1 +1 @@ -../../common/accounting_deployments/accounting-config.yaml \ No newline at end of file +../../common/accounting_deployments/accounting-config-stage.yaml \ No newline at end of file -- GitLab