Refactor: replace distro with debian_codename everywhere

5 files changed, 9 insertions, 11 deletions

diff --git a/ansible/roles/ci-build-using-apt/tasks/main.yml b/ansible/roles/ci-build-using-apt/tasks/main.yml
index 8ee2f9c..cc2a03f 100644
--- a/ansible/roles/ci-build-using-apt/tasks/main.yml
+++ b/ansible/roles/ci-build-using-apt/tasks/main.yml
@@ -1,11 +1,11 @@
 - name: add ick ci build repo to APT sources
   apt_repository:
-    repo: "deb http://localhost/ick/debian {{ codeliwfidistro|default(distro) }}-ci main"
+    repo: "deb http://localhost/ick/debian {{ codeliwfidistro|default(debian_codename) }}-ci main"
     update_cache: no
 
 - name: add ick ci build repo sources to APT sources
   apt_repository:
-    repo: "deb-src http://localhost/ick/debian {{ codeliwfidistro|default(distro) }}-ci main"
+    repo: "deb-src http://localhost/ick/debian {{ codeliwfidistro|default(debian_codename) }}-ci main"
     update_cache: no
 
 - name: install ci repot signing key
diff --git a/ansible/roles/code.liw.fi-using-apt/templates/sources.list.j2 b/ansible/roles/code.liw.fi-using-apt/templates/sources.list.j2
index 380bdc8..c826186 100644
--- a/ansible/roles/code.liw.fi-using-apt/templates/sources.list.j2
+++ b/ansible/roles/code.liw.fi-using-apt/templates/sources.list.j2
@@ -1,2 +1,2 @@
-deb http://code.liw.fi/debian {{ codeliwfidistro|default(distro) }} main
-deb-src http://code.liw.fi/debian {{ codeliwfidistro|default(distro) }} main
+deb http://code.liw.fi/debian {{ codeliwfidistro|default(debian_codename) }} main
+deb-src http://code.liw.fi/debian {{ codeliwfidistro|default(debian_codename) }} main
diff --git a/ansible/roles/ick-worker/tasks/pbuilder.yml b/ansible/roles/ick-worker/tasks/pbuilder.yml
index e5d3cf1..fbcedf8 100644
--- a/ansible/roles/ick-worker/tasks/pbuilder.yml
+++ b/ansible/roles/ick-worker/tasks/pbuilder.yml
@@ -5,7 +5,7 @@
   args:
     creates: "{{ pbuilder_ci_tgz }}"
   shell: |
-    pbuilder --create --distribution {{ distro }} \
+    pbuilder --create --distribution {{ debian_codename }} \
     --mirror "{{ pbuilder_mirror }}" \
     --othermirror "deb http://{{ pbuilder_othermirror }}/debian {{ pbuilder_othermirror_distro }} main" \
     --basetgz "{{ pbuilder_ci_tgz }}" \
@@ -15,7 +15,7 @@
   args:
     creates: "{{ pbuilder_release_tgz }}"
   shell: |
-    pbuilder --create --distribution {{ distro }} \
+    pbuilder --create --distribution {{ debian_codename }} \
     --mirror "{{ pbuilder_mirror }}" \
     --othermirror "deb http://{{ pbuilder_othermirror }}/debian {{ pbuilder_othermirror_distro }} main" \
     --basetgz "{{ pbuilder_release_tgz }}" \
diff --git a/ansible/roles/self-updating-system/templates/unattended-upgrades.conf b/ansible/roles/self-updating-system/templates/unattended-upgrades.conf
index 1eec6f6..7675763 100644
--- a/ansible/roles/self-updating-system/templates/unattended-upgrades.conf
+++ b/ansible/roles/self-updating-system/templates/unattended-upgrades.conf
@@ -3,7 +3,7 @@
 // updates, and then reboot during the night.
 
 Unattended-Upgrade::Origins-Pattern {
-        "origin=Debian,codename={{ distro }},label=Debian-Security";
+        "origin=Debian,codename={{ debian_codename }},label=Debian-Security";
 };
 
 Unattended-Upgrade::Mail "root";
diff --git a/ansible/roles/vmhost/tasks/main.yml b/ansible/roles/vmhost/tasks/main.yml
index 83b8594..55ea658 100644
--- a/ansible/roles/vmhost/tasks/main.yml
+++ b/ansible/roles/vmhost/tasks/main.yml
@@ -1,13 +1,11 @@
----
 - apt: name=qemu-kvm
 - apt: name=libvirt-bin
-  when: distro == "jessie"
+  when: debian_codename == "jessie"
 - apt:
     name: "{{ item }}"
   with_items:
     - libvirt-daemon-system
     - libvirt-clients
-  when: distro == "stretch" or distro == "unstable"
+  when: debian_codename == "stretch" or debian_codename == "unstable"
 - apt: name=virtinst
 - apt: name=virt-manager
-...