Feat(variables): Calculate Debian distribution

Ansible knows OS family and version, there is no need
to mark every host with variable `debian_distr`.

diff --git a/hosts b/hosts
index 0e3f9ed2f2f0778509d20aaa9bd80a55bb657035..332312fd4b99685a1d86583bd7a4600d009343e6 100644 (file)
--- a/hosts
+++ b/hosts
@@ -10,5 +10,4 @@ oper.med.ru
 phdru.name debian_mirror=http://debian.mirror.cambrium.nl/debian
 
 [all:vars]
-debian_distr=stretch
 debian_mirror=http://mirror.yandex.ru/debian

diff --git a/playbooks/debian/roles/dev-packages/tasks/main.yml b/playbooks/debian/roles/dev-packages/tasks/main.yml
index e523f95fac15f3f1237219b9b545c1b7f50c5eb8..5d733bcaae415ac4569d3f61b9e607584b7684c1 100644 (file)
--- a/playbooks/debian/roles/dev-packages/tasks/main.yml
+++ b/playbooks/debian/roles/dev-packages/tasks/main.yml
@@ -7,7 +7,7 @@
     install_recommends: no
     name: ['g++', 'gcc', 'git',
            'libexpat1', 'libffi6',
-           'libgdbm{% if debian_distr == "stretch" %}3{% elif debian_distr == "buster" %}6{% endif %}',
+           'libgdbm{% if ansible_facts.distribution_major_version == "9" %}3{% elif ansible_facts.distribution_major_version == "10" %}6{% endif %}',
            'libgmp10',
            'liblzma5', 'libmpdec2', 'libreadline5', 'libreadline7',
            'make', 'openssl', 'patch', 'sqlite3', 'zlib1g',

diff --git a/playbooks/debian/roles/init-system/templates/sources.list b/playbooks/debian/roles/init-system/templates/sources.list
index a235526c283602ed584f7be5ecbdf9a133107011..6681c9d52f49a8ec4f1933bea93fcbb4edd00cfb 100644 (file)
--- a/playbooks/debian/roles/init-system/templates/sources.list
+++ b/playbooks/debian/roles/init-system/templates/sources.list
@@ -1,3 +1,8 @@
+{% if ansible_facts.distribution_major_version == '9' %}
+{% set debian_distr = 'stretch' %}
+{% elif ansible_facts.distribution_major_version == '10' %}
+{% set debian_distr = 'buster' %}
+{% endif %}
 deb {{ debian_mirror }} {{ debian_distr }} main non-free contrib
 deb {{ debian_mirror }} {{ debian_distr }}-updates main non-free contrib
 

diff --git a/playbooks/debian/roles/python-dev-packages/tasks/main.yml b/playbooks/debian/roles/python-dev-packages/tasks/main.yml
index 0b3f99b91fad57cb418ceeb8a2d1eddf2afb401c..1c9277fe793bfc3cb6faaa6f2386df8bb28afdd8 100644 (file)
--- a/playbooks/debian/roles/python-dev-packages/tasks/main.yml
+++ b/playbooks/debian/roles/python-dev-packages/tasks/main.yml
@@ -9,7 +9,7 @@
           ]
     state: latest
     update_cache: yes
-  when: debian_distr == "stretch"
+  when: ansible_facts.distribution_major_version == '9'
 
 - name: Install development packages
   become: true

diff --git a/vbox-inventory b/vbox-inventory
index 6d49280d9c957572c7c27ee6302afa5876af1dca..decbb80210717a5e0b762be3b02be74b0caa7326 100644 (file)
--- a/vbox-inventory
+++ b/vbox-inventory
@@ -1,3 +1,3 @@
-vbox-d9 ansible_host=localhost ansible_port=2022  debian_distr=stretch debian_mirror=http://mirror.yandex.ru/debian
-vbox-d10 ansible_host=localhost ansible_port=2022 debian_distr=buster  debian_mirror=https://mirror.yandex.ru/debian
+vbox-d9 ansible_host=localhost ansible_port=2022  debian_mirror=http://mirror.yandex.ru/debian
+vbox-d10 ansible_host=localhost ansible_port=2022 debian_mirror=https://mirror.yandex.ru/debian
 vbox-f30-64 ansible_host=localhost ansible_port=2022