diff options
| author | Lars Wirzenius <liw@liw.fi> | 2017-08-02 09:26:10 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2017-08-02 09:26:10 +0300 |
| commit | ec3aa13d2de9106ac28487236ee769d1c18fcd5f (patch) | |
| tree | b74c592710736594a7b418d0a1b9db6c4939dad6 /ansible | |
| parent | 1b2e95814f8f090b4b9fa7dcee535ea24ad91394 (diff) | |
| download | ansibleness-ec3aa13d2de9106ac28487236ee769d1c18fcd5f.tar.gz | |
Fix: e2 code.liw.fi distro
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/group_vars/ick-workers.yml | 2 | ||||
| -rw-r--r-- | ansible/host_vars/exolobe2.yml | 1 | ||||
| -rw-r--r-- | ansible/hosts | 10 | ||||
| -rw-r--r-- | ansible/roles/ick-worker/tasks/pbuilder.yml | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/ansible/group_vars/ick-workers.yml b/ansible/group_vars/ick-workers.yml index 8d3a577..5664ba9 100644 --- a/ansible/group_vars/ick-workers.yml +++ b/ansible/group_vars/ick-workers.yml @@ -1,5 +1,5 @@ timezone: Europe/Helsinki -pbuilder_mirror: http://debmirror/debian +pbuilder_mirror: http://ftp.fi.debian.org/debian pbuilder_othermirror: code.liw.fi pbuilder_ci_tgz: /var/cache/pbuilder/ci.tgz pbuilder_release_tgz: /var/cache/pbuilder/release.tgz diff --git a/ansible/host_vars/exolobe2.yml b/ansible/host_vars/exolobe2.yml index 6817fac..de25b33 100644 --- a/ansible/host_vars/exolobe2.yml +++ b/ansible/host_vars/exolobe2.yml @@ -1,6 +1,7 @@ hostname: exolobe2 debian_codename: stretch distro: stretch +codeliwfidistro: stretch authkeys_dir: /home/liw/code/ansibleness/ansible/authorized_keys unix_users: diff --git a/ansible/hosts b/ansible/hosts index bcc4232..43d13de 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -12,6 +12,9 @@ ext-ick-debian8-i386 hostname=ick-debian8-i386 debian_codename=jess 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 +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 pieni ansible_ssh_host=koom.pieni.net debian_codename=stretch distro=stretch ick2dev vmdb2dev @@ -34,7 +37,7 @@ ext-ick-debian8-amd64 ext-ick-debian7-amd64 ext-ick-debian7-i386 -[ick-workers] +[old-ick-workers] ext-ick-unstable-amd64 ext-ick-unstable-i386 ext-ick-debian8-i386 @@ -42,6 +45,11 @@ ext-ick-debian8-amd64 #ext-ick-debian7-amd64 #ext-ick-debian7-i386 +[ick-workers] +ick3-jessie +ick3-stretch +ick3-unstable + [onexolobe3] ick2dev vmdb2dev diff --git a/ansible/roles/ick-worker/tasks/pbuilder.yml b/ansible/roles/ick-worker/tasks/pbuilder.yml index 14da505..e5d3cf1 100644 --- a/ansible/roles/ick-worker/tasks/pbuilder.yml +++ b/ansible/roles/ick-worker/tasks/pbuilder.yml @@ -7,7 +7,7 @@ shell: | pbuilder --create --distribution {{ distro }} \ --mirror "{{ pbuilder_mirror }}" \ - --othermirror "deb http://{{ pbuilder_othermirror }}/debian {{ distro }} main" \ + --othermirror "deb http://{{ pbuilder_othermirror }}/debian {{ pbuilder_othermirror_distro }} main" \ --basetgz "{{ pbuilder_ci_tgz }}" \ --keyring /etc/apt/trusted.gpg.d/code.liw.fi-keyring.gpg @@ -17,6 +17,6 @@ shell: | pbuilder --create --distribution {{ distro }} \ --mirror "{{ pbuilder_mirror }}" \ - --othermirror "deb http://{{ pbuilder_othermirror }}/debian {{ distro }} main" \ + --othermirror "deb http://{{ pbuilder_othermirror }}/debian {{ pbuilder_othermirror_distro }} main" \ --basetgz "{{ pbuilder_release_tgz }}" \ --keyring /etc/apt/trusted.gpg.d/code.liw.fi-keyring.gpg |