Commit 5f14786b authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Changed to more convinient client configuration.

parent 4c2e1752
eels @ ed3d77fd
Subproject commit ed3d77fdb5c16ebc11c9a8b509fe5cdbc57674fd
......@@ -197,7 +197,7 @@ normalize = NomadConfig(
client = NomadConfig(
user='leonard.hofstadter@nomad-fairdi.tests.de',
password='password',
url='http://localhost:8000/fairdi/nomad/latest/api'
url='http://repository.nomad-coe.eu/app/api'
)
datacite = NomadConfig(
......
......@@ -135,6 +135,13 @@ spec:
name: {{ .Values.keycloak.clientSecret }}
key: password
{{ end }}
{{ if .Values.client.passwordSecret }}
- name: NOMAD_CLIENT_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Values.client.passwordSecret }}
key: password
{{ end }}
{{ if .Values.keycloak.passwordSecret }}
- name: NOMAD_KEYCLOAK_PASSWORD
valueFrom:
......
......@@ -10,7 +10,6 @@ metadata:
data:
nomad.yaml: |
release: "{{ .Release.Name }}"
domain: "{{ .Values.domain }}"
reprocess_unmatched: {{ .Values.reprocess_unmatched }}
fs:
tmp: "{{ .Values.volumes.tmp }}"
......@@ -54,6 +53,8 @@ data:
celery:
routing: "{{ .Values.worker.routing }}"
timeout: 7200
client:
user: "{{ .Values.client.username }}"
keycloak:
server_url: "{{ .Values.keycloak.serverUrl }}"
realm_name: "{{ .Values.keycloak.realmName }}"
......
......@@ -131,6 +131,9 @@ mail:
port: 25
from: 'webmaster@nomad-coe.eu'
client:
username: admin
keycloak:
serverExternalUrl: "https://repository.nomad-coe.eu/fairdi/keycloak/auth/"
serverUrl: "https://repository.nomad-coe.eu/fairdi/keycloak/auth/"
......@@ -148,10 +151,6 @@ volumes:
tmp: /nomad/fairdi/latest/fs/tmp
nomad: /nomad
## Everything else
# The domain configuration, currently there is DFT and EMS
domain: DFT
springerDbPath: /nomad/fairdi/db/data/springer.msg
# Will reprocess calculations with their old matched parser, even if they do not
......
......@@ -29,7 +29,7 @@ from tests.utils import assert_exception
# TODO there is much more to test
@pytest.mark.usefixtures('reset_config', 'no_warn')
@pytest.mark.usefixtures('reset_config', 'no_warn', 'mongo_infra', 'elastic_infra', 'raw_files_infra')
class TestAdmin:
def test_reset(self):
result = click.testing.CliRunner().invoke(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment