Просмотр исходного кода

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.
pull/1692/head
Slavi Pantaleev 4 лет назад
Родитель
Сommit
1895b01810
2 измененных файлов: 2 добавлений и 2 удалений
  1. +0
    -2
      group_vars/matrix_servers
  2. +2
    -0
      roles/matrix-base/defaults/main.yml

+ 0
- 2
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.<your-domain>`).

matrix_container_global_registry_prefix: "docker.io/"

######################################################################
#
# matrix-base


+ 2
- 0
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"



Загрузка…
Отмена
Сохранить