diff options
| -rw-r--r-- | ansible/debmirror.yml | 2 | ||||
| -rw-r--r-- | ansible/exolobe2.yml | 2 | ||||
| -rw-r--r-- | ansible/exolobe3.yml | 2 | ||||
| -rw-r--r-- | ansible/group_vars/ick-workers.yml | 4 | ||||
| -rw-r--r-- | ansible/group_vars/infinland.yml | 4 | ||||
| -rw-r--r-- | ansible/holywood.yml | 2 | ||||
| -rw-r--r-- | ansible/host_vars/pieni.yml | 4 | ||||
| -rw-r--r-- | ansible/hosts | 28 | ||||
| -rw-r--r-- | ansible/ick.yml | 2 | ||||
| -rw-r--r-- | ansible/leonard.yml | 2 | ||||
| -rw-r--r-- | ansible/obbench.yml | 2 | ||||
| -rw-r--r-- | ansible/pieni.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ick-worker/tasks/ick-user.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/ick-worker/tasks/pbuilder.yml | 4 | ||||
| -rw-r--r-- | ansible/willikins.yml | 2 |
15 files changed, 35 insertions, 35 deletions
diff --git a/ansible/debmirror.yml b/ansible/debmirror.yml index 0857eea..4a56ddd 100644 --- a/ansible/debmirror.yml +++ b/ansible/debmirror.yml @@ -3,7 +3,7 @@ become: yes roles: - code.liw.fi-using-apt - - sane-debian-system + - sane_debian_system - version-controller - unix_users - postfix-null-client diff --git a/ansible/exolobe2.yml b/ansible/exolobe2.yml index 71b94a8..5b34a88 100644 --- a/ansible/exolobe2.yml +++ b/ansible/exolobe2.yml @@ -2,7 +2,7 @@ remote_user: ansible become: yes roles: - - sane-debian-system + - sane_debian_system - liw-usual - version-controller - unix_users diff --git a/ansible/exolobe3.yml b/ansible/exolobe3.yml index 6e890f2..28b3788 100644 --- a/ansible/exolobe3.yml +++ b/ansible/exolobe3.yml @@ -4,7 +4,7 @@ roles: - code.liw.fi-using-apt - ci-build-using-apt - - sane-debian-system + - sane_debian_system - local-u2f-auth - liw-usual - version-controller diff --git a/ansible/group_vars/ick-workers.yml b/ansible/group_vars/ick-workers.yml index 8203494..834b10b 100644 --- a/ansible/group_vars/ick-workers.yml +++ b/ansible/group_vars/ick-workers.yml @@ -1,6 +1,6 @@ -debian_mirror: http://debmirror/debian +debian_mirror: debmirror debian_mirror_src: null -othermirror: http://code.liw.fi/debian +othermirror: code.liw.fi pbuilder_ci_tgz: /var/cache/pbuilder/ci.tgz pbuilder_release_tgz: /var/cache/pbuilder/release.tgz unix_users: []
\ No newline at end of file diff --git a/ansible/group_vars/infinland.yml b/ansible/group_vars/infinland.yml index 82313da..b7a12bd 100644 --- a/ansible/group_vars/infinland.yml +++ b/ansible/group_vars/infinland.yml @@ -1,5 +1,5 @@ -debian_mirror: http://ftp.fi.debian.org/debian -debian_mirror_src: http://httpredir.debian.org/debian +debian_mirror: ftp.fi.debian.org +debian_mirror_src: httpredir.debian.org relayhost: pieni.net:587 smarthost: pieni.net smarthost_user: pienirelay diff --git a/ansible/holywood.yml b/ansible/holywood.yml index ed96fb1..5e7ec4a 100644 --- a/ansible/holywood.yml +++ b/ansible/holywood.yml @@ -2,7 +2,7 @@ remote_user: ansible become: yes roles: - - sane-debian-system + - sane_debian_system - liw-usual - version-controller - unix_users diff --git a/ansible/host_vars/pieni.yml b/ansible/host_vars/pieni.yml index 663078a..88bbe7b 100644 --- a/ansible/host_vars/pieni.yml +++ b/ansible/host_vars/pieni.yml @@ -1,7 +1,7 @@ hostname: koom distro: stretch -debian_mirror: http://ftp.fi.debian.org/debian -debian_mirror_src: http://httpredir.debian.org/debian +debian_mirror: ftp.fi.debian.org +debian_mirror_src: httpredir.debian.org codeliwfidistro: unstable mailname: pienitest gitano_bypass_pub: /home/liw/.ssh/gitano-bypass-key.pub diff --git a/ansible/hosts b/ansible/hosts index c16124e..93c157b 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -1,18 +1,18 @@ [all] -willikins hostname=willikins distro=jessie -holywood hostname=holywood distro=jessie -exolobe2 hostname=exolobe2 distro=jessie -exolobe3 hostname=exolobe3 distro=stretch ansible_ssh_host=localhost -debmirror hostname=debmirror distro=jessie -leonard hostname=leonard distro=stretch -e2obbench hostname=e2obbench distro=jessie -ick-unstable-amd64 hostname=ick-unstable-amd64 distro=unstable -ick-unstable-i386 hostname=ick-unstable-i386 distro=unstable -ick-debian8-i386 hostname=ick-debian8-i386 distro=jessie -ick-debian8-amd64 hostname=ick-debian8-amd64 distro=jessie -ick-debian7-amd64 hostname=ick-debian7-amd64 distro=wheezy -ick-debian7-i386 hostname=ick-debian7-i386 distro=wheezy -pieni ansible_ssh_host=88.99.190.206 +willikins hostname=willikins debian_codename=jessie distro=jessie +holywood hostname=holywood debian_codename=jessie distro=jessie +exolobe2 hostname=exolobe2 debian_codename=jessie distro=jessie +exolobe3 hostname=exolobe3 debian_codename=stretch distro=stretch ansible_ssh_host=localhost +debmirror hostname=debmirror debian_codename=jessie distro=jessie +leonard hostname=leonard debian_codename=stretch distro=stretch +e2obbench hostname=e2obbench debian_codename=jessie distro=jessie +ick-unstable-amd64 hostname=ick-unstable-amd64 debian_codename=unstable distro=unstable +ick-unstable-i386 hostname=ick-unstable-i386 debian_codename=unstable distro=unstable +ick-debian8-i386 hostname=ick-debian8-i386 debian_codename=jessie distro=jessie +ick-debian8-amd64 hostname=ick-debian8-amd64 debian_codename=jessie distro=jessie +ick-debian7-amd64 hostname=ick-debian7-amd64 debian_codename=wheezy distro=wheezy +ick-debian7-i386 hostname=ick-debian7-i386 debian_codename=wheezy distro=wheezy +pieni ansible_ssh_host=88.99.190.206 debian_codename=stretch distro=stretch [obbench] e2obbench diff --git a/ansible/ick.yml b/ansible/ick.yml index 190ad26..90801b5 100644 --- a/ansible/ick.yml +++ b/ansible/ick.yml @@ -2,7 +2,7 @@ remote_user: ansible become: yes roles: - - sane-debian-system + - sane_debian_system - code.liw.fi-using-apt - version-controller - python-dev-env diff --git a/ansible/leonard.yml b/ansible/leonard.yml index 3a26371..d9195dd 100644 --- a/ansible/leonard.yml +++ b/ansible/leonard.yml @@ -3,7 +3,7 @@ become: yes roles: - code.liw.fi-using-apt - - sane-debian-system + - sane_debian_system - liw-usual - version-controller - liw-devel-system diff --git a/ansible/obbench.yml b/ansible/obbench.yml index f757e90..6d27c85 100644 --- a/ansible/obbench.yml +++ b/ansible/obbench.yml @@ -3,7 +3,7 @@ become: yes roles: - code.liw.fi-using-apt - - sane-debian-system + - sane_debian_system - liw-usual - version-controller - python-dev-env diff --git a/ansible/pieni.yml b/ansible/pieni.yml index 36866d8..7dfc925 100644 --- a/ansible/pieni.yml +++ b/ansible/pieni.yml @@ -3,7 +3,7 @@ become: yes roles: - code.liw.fi-using-apt - - sane-debian-system + - sane_debian_system - comfortable-debian-system - unix_users - web-server diff --git a/ansible/roles/ick-worker/tasks/ick-user.yml b/ansible/roles/ick-worker/tasks/ick-user.yml index 298f70d..249b77e 100644 --- a/ansible/roles/ick-worker/tasks/ick-user.yml +++ b/ansible/roles/ick-worker/tasks/ick-user.yml @@ -17,10 +17,10 @@ dest: /etc/modules line: fuse -- name: load fuse kernel module into memory now - modprobe: - name: fuse - state: present +# - name: load fuse kernel module into memory now +# modprobe: +# name: fuse +# state: present - name: give ick sudo access copy: diff --git a/ansible/roles/ick-worker/tasks/pbuilder.yml b/ansible/roles/ick-worker/tasks/pbuilder.yml index 080c4eb..d5d1c5f 100644 --- a/ansible/roles/ick-worker/tasks/pbuilder.yml +++ b/ansible/roles/ick-worker/tasks/pbuilder.yml @@ -6,7 +6,7 @@ creates: "{{ pbuilder_ci_tgz }}" shell: | pbuilder --create --distribution {{ distro }} \ - --othermirror "deb {{ othermirror }} {{ distro }} main" \ + --othermirror "deb http://{{ othermirror }} {{ distro }} main" \ --basetgz "{{ pbuilder_ci_tgz }}" - name: create pbuilder release basetgz @@ -14,6 +14,6 @@ creates: "{{ pbuilder_release_tgz }}" shell: | pbuilder --create --distribution {{ distro }} \ - --othermirror "deb {{ othermirror }} {{ distro }} main" \ + --othermirror "deb http://{{ othermirror }} {{ distro }} main" \ --basetgz "{{ pbuilder_release_tgz }}" ... diff --git a/ansible/willikins.yml b/ansible/willikins.yml index 32e675b..637b86d 100644 --- a/ansible/willikins.yml +++ b/ansible/willikins.yml @@ -3,7 +3,7 @@ become: yes roles: - code.liw.fi-using-apt - - sane-debian-system + - sane_debian_system - liw-usual - version-controller - unix_users |