From 1895b0181082fd31416330bf08f0fc3191ccd4e3 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 10 Mar 2022 11:28:25 +0200 Subject: [PATCH] Move matrix_container_global_registry_prefix to matrix-base Various roles depend on this. It makes sense to make it part of the `matrix-base` role. --- group_vars/matrix_servers | 2 -- roles/matrix-base/defaults/main.yml | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 4301ae7eb..8858a0542 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -9,8 +9,6 @@ # You can also override ANY variable (seen here or in any given role), # by re-defining it in your own configuration file (`inventory/host_vars/matrix.`). -matrix_container_global_registry_prefix: "docker.io/" - ###################################################################### # # matrix-base diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml index e83b6c955..983a29a0a 100644 --- a/roles/matrix-base/defaults/main.yml +++ b/roles/matrix-base/defaults/main.yml @@ -65,6 +65,8 @@ matrix_architecture: amd64 # We just remap from our `matrix_architecture` values to what Debian and possibly other distros call things. matrix_debian_arch: "{{ 'armhf' if matrix_architecture == 'arm32' else matrix_architecture }}" +matrix_container_global_registry_prefix: "docker.io/" + matrix_user_username: "matrix" matrix_user_groupname: "matrix"