diff options
| -rw-r--r-- | ansible/host_vars/debmirror.yml | 1 | ||||
| -rw-r--r-- | ansible/host_vars/e2obbench.yml | 10 | ||||
| -rw-r--r-- | ansible/host_vars/exolobe2.yml | 1 | ||||
| -rw-r--r-- | ansible/host_vars/holywood.yml | 1 | ||||
| -rw-r--r-- | ansible/host_vars/ick2dev.yml | 1 | ||||
| -rw-r--r-- | ansible/host_vars/pieni.yml | 2 | ||||
| -rw-r--r-- | ansible/host_vars/vmdb2dev.yml | 1 | ||||
| -rw-r--r-- | ansible/host_vars/willikins.yml | 1 | ||||
| -rw-r--r-- | ansible/hosts | 24 | ||||
| -rw-r--r-- | ansible/roles/ci-build-using-apt/tasks/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/code.liw.fi-using-apt/templates/sources.list.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/ick-worker/tasks/pbuilder.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/self-updating-system/templates/unattended-upgrades.conf | 2 | ||||
| -rw-r--r-- | ansible/roles/vmhost/tasks/main.yml | 6 |
14 files changed, 22 insertions, 40 deletions
diff --git a/ansible/host_vars/debmirror.yml b/ansible/host_vars/debmirror.yml index eb63e91..9957de0 100644 --- a/ansible/host_vars/debmirror.yml +++ b/ansible/host_vars/debmirror.yml @@ -1,6 +1,5 @@ hostname: debmirror debian_codename: stretch -distro: stretch codeliwfidistro: unstable mailname: debmirror.liw.fi authkeys_dir: /home/liw/code/ansibleness/ansible/authorized_keys diff --git a/ansible/host_vars/e2obbench.yml b/ansible/host_vars/e2obbench.yml deleted file mode 100644 index 159cfcc..0000000 --- a/ansible/host_vars/e2obbench.yml +++ /dev/null @@ -1,10 +0,0 @@ -hostname: e2obbench -debian_codename: stretch -distro: stretch -codeliwfidistro: unstable - -unix_users: - - username: liw - comment: Lars Wirzenius - - username: obbench - domment: Obnam benchmark results diff --git a/ansible/host_vars/exolobe2.yml b/ansible/host_vars/exolobe2.yml index de25b33..9ca019b 100644 --- a/ansible/host_vars/exolobe2.yml +++ b/ansible/host_vars/exolobe2.yml @@ -1,6 +1,5 @@ hostname: exolobe2 debian_codename: stretch -distro: stretch codeliwfidistro: stretch authkeys_dir: /home/liw/code/ansibleness/ansible/authorized_keys diff --git a/ansible/host_vars/holywood.yml b/ansible/host_vars/holywood.yml index 4d382da..357acc8 100644 --- a/ansible/host_vars/holywood.yml +++ b/ansible/host_vars/holywood.yml @@ -1,6 +1,5 @@ hostname: holywood debian_codename: stretch -distro: stretch debian_mirror: ftp.fi.debian.org debian_mirror_src: ftp.fi.debian.org authkeys_dir: /home/liw/code/ansibleness/ansible/authorized_keys diff --git a/ansible/host_vars/ick2dev.yml b/ansible/host_vars/ick2dev.yml index 5296e06..007a4ee 100644 --- a/ansible/host_vars/ick2dev.yml +++ b/ansible/host_vars/ick2dev.yml @@ -1,6 +1,5 @@ hostname: ick2dev -distro: stretch debian_codename: stretch debian_mirror: ftp.fi.debian.org debian_mirror_src: ftp.fi.debian.org diff --git a/ansible/host_vars/pieni.yml b/ansible/host_vars/pieni.yml index fde7a03..733bb4d 100644 --- a/ansible/host_vars/pieni.yml +++ b/ansible/host_vars/pieni.yml @@ -1,5 +1,5 @@ hostname: koom -distro: stretch +debian_codename: stretch debian_mirror: http.debian.net debian_mirror_src: http.debian.net codeliwfidistro: unstable diff --git a/ansible/host_vars/vmdb2dev.yml b/ansible/host_vars/vmdb2dev.yml index e2e2b18..12fe788 100644 --- a/ansible/host_vars/vmdb2dev.yml +++ b/ansible/host_vars/vmdb2dev.yml @@ -1,6 +1,5 @@ hostname: vmdb2dev -distro: stretch debian_codename: stretch debian_mirror: ftp.fi.debian.org debian_mirror_src: ftp.fi.debian.org diff --git a/ansible/host_vars/willikins.yml b/ansible/host_vars/willikins.yml index b12b445..9ca3e30 100644 --- a/ansible/host_vars/willikins.yml +++ b/ansible/host_vars/willikins.yml @@ -1,6 +1,5 @@ hostname: willikins debian_codename: stretch -distro: stretch codeliwfidistro: unstable locales: diff --git a/ansible/hosts b/ansible/hosts index cfaa0b5..e7fb843 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -2,20 +2,20 @@ willikins holywood exolobe2 -exolobe3 hostname=exolobe3 debian_codename=stretch distro=stretch ansible_ssh_host=localhost +exolobe3 hostname=exolobe3 debian_codename=stretch ansible_ssh_host=localhost debmirror -leonard hostname=leonard debian_codename=stretch distro=stretch +leonard hostname=leonard debian_codename=stretch e2obbench -ext-ick-unstable-amd64 hostname=ick-unstable-amd64 debian_codename=unstable distro=unstable -ext-ick-unstable-i386 hostname=ick-unstable-i386 debian_codename=unstable distro=unstable -ext-ick-debian8-i386 hostname=ick-debian8-i386 debian_codename=jessie distro=jessie -ext-ick-debian8-amd64 hostname=ick-debian8-amd64 debian_codename=jessie distro=jessie -ext-ick-debian7-amd64 hostname=ick-debian7-amd64 debian_codename=wheezy distro=wheezy -ext-ick-debian7-i386 hostname=ick-debian7-i386 debian_codename=wheezy distro=wheezy -ick3-unstable hostname=ick3-unstable debian_codename=unstable distro=unstable pbuilder_othermirror_distro=unstable codeliwfidistro=unstable -ick3-stretch hostname=ick3-stretch debian_codename=stretch distro=stretch codeliwfidistro=unstable pbuilder_othermirror_distro=unstable -ick3-jessie hostname=ick3-jessie debian_codename=jessie distro=jessie pbuilder_othermirror_distro=jessie codeliwfidistro=jessie -pieni ansible_ssh_host=koom.pieni.net debian_codename=stretch distro=stretch +ext-ick-unstable-amd64 hostname=ick-unstable-amd64 debian_codename=unstable +ext-ick-unstable-i386 hostname=ick-unstable-i386 debian_codename=unstable +ext-ick-debian8-i386 hostname=ick-debian8-i386 debian_codename=jessie +ext-ick-debian8-amd64 hostname=ick-debian8-amd64 debian_codename=jessie +ext-ick-debian7-amd64 hostname=ick-debian7-amd64 debian_codename=wheezy +ext-ick-debian7-i386 hostname=ick-debian7-i386 debian_codename=wheezy +ick3-unstable hostname=ick3-unstable debian_codename=unstable pbuilder_othermirror_distro=unstable codeliwfidistro=unstable +ick3-stretch hostname=ick3-stretch debian_codename=stretch codeliwfidistro=unstable pbuilder_othermirror_distro=unstable +ick3-jessie hostname=ick3-jessie debian_codename=jessie pbuilder_othermirror_distro=jessie codeliwfidistro=jessie +pieni ansible_ssh_host=koom.pieni.net debian_codename=stretch ick2dev vmdb2dev 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 -... |