diff --git a/dependencies/parsers/mpes b/dependencies/parsers/mpes index 26e4b0b365501f84eaceb12f9d79c04fb1faca38..e772c6d954009d7b3419200ffd370f55fd62c1a4 160000 --- a/dependencies/parsers/mpes +++ b/dependencies/parsers/mpes @@ -1 +1 @@ -Subproject commit 26e4b0b365501f84eaceb12f9d79c04fb1faca38 +Subproject commit e772c6d954009d7b3419200ffd370f55fd62c1a4 diff --git a/nomad/config.py b/nomad/config.py index 762e7cf18dcf8bd682cad0657971ccb6b761c953..1624fdbc43e41a2a00837160477ec801509a7cf0 100644 --- a/nomad/config.py +++ b/nomad/config.py @@ -123,9 +123,7 @@ services = NomadConfig( disable_reset=True, not_processed_value='not processed', unavailable_value='unavailable', - https=False, - migrated=False # with migrated data will not show data of user 1 in search results, - # since this user was used for data with unknown provenance + https=False ) tests = NomadConfig( diff --git a/ops/helm/nomad/templates/nomad-configmap.yml b/ops/helm/nomad/templates/nomad-configmap.yml index 12e74cce8e3bfab3a6b06ddd41aa4f3ae4ea5961..e545e210aa15a1cd1cca96c4fc586c331580a768 100644 --- a/ops/helm/nomad/templates/nomad-configmap.yml +++ b/ops/helm/nomad/templates/nomad-configmap.yml @@ -27,7 +27,6 @@ data: admin_password: "{{ .Values.api.adminPassword }}" disable_reset: {{ .Values.api.disableReset }} https: {{ .Values.api.https }} - migrated: {{ .Values.api.migrated }} rabbitmq: host: "{{ .Release.Name }}-rabbitmq" elastic: diff --git a/ops/helm/nomad/values.yaml b/ops/helm/nomad/values.yaml index b4177d81cd76b0b49174b1ab61ece9bc8b42acf9..ffd7ac0b50e4020bce5c30eb6e85ed386f1f55af 100644 --- a/ops/helm/nomad/values.yaml +++ b/ops/helm/nomad/values.yaml @@ -39,8 +39,6 @@ api: adminPassword: "password" ## Disable the dangerous reset (delete all data) function disableReset: "true" - ## Do not show data of user with id 1, since he was used for data with unknown provernance - migrated: "false" ## Everthing concerning the nomad worker worker: diff --git a/ops/scripts/nomad.migration.values.yaml b/ops/scripts/nomad.migration.values.yaml index 8bf46239a9ce9641bb1699d2d19f9df8f17b3fed..e1e757d493386c7fa3f78a4cbbb797e2f7e6e59c 100644 --- a/ops/scripts/nomad.migration.values.yaml +++ b/ops/scripts/nomad.migration.values.yaml @@ -6,7 +6,6 @@ proxy: api: disableReset: false - migrated: true worker: replicas: 3