diff --git a/ansible/group_vars/all/with.yml b/ansible/group_vars/all/with.yml index e7a43a1c1..98dd4b9c5 100644 --- a/ansible/group_vars/all/with.yml +++ b/ansible/group_vars/all/with.yml @@ -21,3 +21,4 @@ WITH_MIGRATION_SYSTEMS: false WITH_COMMON_CARTRIDGE: false WITH_CLAMMIT: false WITH_MEDIA_LICENSES: false +WITH_MEDIA_METADATA_SYNC: false diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml index e7dbf5c09..e9e3c8135 100644 --- a/ansible/group_vars/develop/cfg.yml +++ b/ansible/group_vars/develop/cfg.yml @@ -52,6 +52,7 @@ SERVER_TSP_SYNC_BASE_CRONJOB: "{{ SERVER_TSP_RANDOM|int + 9 }} 3 * * *" SERVER_TSP_SYNC_SCHOOL_CRONJOB: "{{ SERVER_TSP_RANDOM|int + 39 }} 3 * * *" ROCKETCHAT_FIXUP_CRONJOB_SCHEDULE: "{{ 5 | random(seed=NAMESPACE) }}/5 * * * *" SERVER_VIDIS_SYNC_CRONJOB_SCHEDULE: "{{ 20 | random(seed=NAMESPACE) }} 4 * * *" +SERVER_MEDIA_METADATA_SYNC_CRONJOB_SCHEDULE: "{{ 30 | random(seed=NAMESPACE) }} 2 * * *" # JWT_PUBLIC_KEY must be single quoted. When using double quotes newlines are replaced by spaces. JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAqYX8ofa9B+nL+IIPxHJSWgq/ZRYV95uwWkSsGAKG7pkRGhi9VrRr\nUxsVz8LWV2ZEL5+kgaPBmZgGixNk3Kmta86I3h6c0YS/GtD24D8rTdGnmH4LnwSv\n1VTfM5Wjo628cM7GD8SMSOr0iwMH/pEoDOISvfc4YPodO8KgUOFxEk/Py7fCIqNd\n2k60hFpodUt6aqP0gR2vt5Cd4qpRsxxQxJFmb3g57LOt3TOu6I2qD5FaMWEeyMdY\nPxm2DJex9FAxL5PtvDgMNa3u7L5tFysBy/axxpZtuPDYBzU5UeSG0izNEr1q/ZJr\nAqzcVaIvqXKM64iZS1CoP3QlCL/wcZUqPB25VHji7PV2Ddb23oyi7kNQ70c2hp8a\n3m8LRz9vVyNVby+yIdgMUaCboT/K8MocA9hNyb53zLMjDi+1QXx/CrU4BQQiPVvE\n+7wuywO9VGVX7Xfvm3aIWN3r6qPOb6IOhaoFXlXUaENEmyTxaRCsWzJTHL8Fao+x\nq+dwaarp32XfFLLj4LwMKosB5pSFXMXH8mhQiKTgU1BnVrcxvkNWbO84OLX4gHDq\nkODyueBDmkaUwEOuPZnPLZMi/EFHeJIf3xeqcexZ8MiIvu6GSSx+6ZSF2orRsZ6T\nvpD/2o9N4cgF8+U3ng37nM9ohaSSuG+ZnUFlQwEP7FJ7mHl/JS63VEUCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n' diff --git a/ansible/group_vars/production/resources.yml b/ansible/group_vars/production/resources.yml index 23a55c3cf..1e41ec8cc 100644 --- a/ansible/group_vars/production/resources.yml +++ b/ansible/group_vars/production/resources.yml @@ -139,3 +139,7 @@ MEDIA_ACTIVATION_CPU_LIMITS: "2000m" MEDIA_ACTIVATION_CPU_REQUESTS: "100m" MEDIA_ACTIVATION_MEMORY_LIMITS: "2Gi" MEDIA_ACTIVATION_MEMORY_REQUESTS: "2Gi" +MEDIA_METADATA_SYNC_CPU_LIMITS: "2000m" +MEDIA_METADATA_SYNC_CPU_REQUESTS: "100m" +MEDIA_METADATA_SYNC_MEMORY_LIMITS: "2Gi" +MEDIA_METADATA_SYNC_MEMORY_REQUESTS: "2Gi" diff --git a/ansible/group_vars/reference/resources.yml b/ansible/group_vars/reference/resources.yml index f2d0ee89d..72a481c05 100644 --- a/ansible/group_vars/reference/resources.yml +++ b/ansible/group_vars/reference/resources.yml @@ -139,3 +139,7 @@ MEDIA_ACTIVATION_CPU_LIMITS: "2000m" MEDIA_ACTIVATION_CPU_REQUESTS: "100m" MEDIA_ACTIVATION_MEMORY_LIMITS: "2Gi" MEDIA_ACTIVATION_MEMORY_REQUESTS: "2Gi" +MEDIA_METADATA_SYNC_CPU_LIMITS: "2000m" +MEDIA_METADATA_SYNC_CPU_REQUESTS: "100m" +MEDIA_METADATA_SYNC_MEMORY_LIMITS: "2Gi" +MEDIA_METADATA_SYNC_MEMORY_REQUESTS: "2Gi" diff --git a/ansible/host_vars/nbc_host/with.yml b/ansible/host_vars/nbc_host/with.yml index 111b54c3c..fb74c844f 100644 --- a/ansible/host_vars/nbc_host/with.yml +++ b/ansible/host_vars/nbc_host/with.yml @@ -1,2 +1,4 @@ # Media License (VIDIS) WITH_MEDIA_LICENSES: true + +WITH_MEDIA_METADATA_SYNC: true diff --git a/ansible/host_vars/prod-nbc/with.yml b/ansible/host_vars/prod-nbc/with.yml index 3a4aa04e9..070451743 100644 --- a/ansible/host_vars/prod-nbc/with.yml +++ b/ansible/host_vars/prod-nbc/with.yml @@ -1 +1,3 @@ WITH_STORAGE: false + +WITH_MEDIA_METADATA_SYNC: false diff --git a/ansible/host_vars/ref-nbc/with.yml b/ansible/host_vars/ref-nbc/with.yml index fce0166ad..dd293b958 100644 --- a/ansible/host_vars/ref-nbc/with.yml +++ b/ansible/host_vars/ref-nbc/with.yml @@ -1 +1,3 @@ WITH_STORAGE: true + +WITH_MEDIA_METADATA_SYNC: false diff --git a/ansible/playbook.yml b/ansible/playbook.yml index 97a2262e8..0f7ad4794 100644 --- a/ansible/playbook.yml +++ b/ansible/playbook.yml @@ -52,3 +52,4 @@ - post_deployment - moin-schule-sync - media-licenses + - media-metadata-sync diff --git a/ansible/playbook_rollout.yml b/ansible/playbook_rollout.yml index 89e20b373..e55b13233 100644 --- a/ansible/playbook_rollout.yml +++ b/ansible/playbook_rollout.yml @@ -56,3 +56,4 @@ - role: moin-schule-sync when: WITH_MOIN_SCHULE is defined and WITH_MOIN_SCHULE|bool - role: media-licenses + - role: media-metadata-sync