diff options
| -rw-r--r-- | ansible/group_vars/ick-workers.yml | 1 | ||||
| -rw-r--r-- | ansible/host_vars/debmirror.yml | 3 | ||||
| -rw-r--r-- | ansible/host_vars/e2obbench.yml | 5 | ||||
| -rw-r--r-- | ansible/host_vars/exolobe2.yml | 3 | ||||
| -rw-r--r-- | ansible/host_vars/holywood.yml | 3 | ||||
| -rw-r--r-- | ansible/host_vars/leonard.yml | 3 | ||||
| -rw-r--r-- | ansible/host_vars/willikins.yml | 3 | ||||
| -rw-r--r-- | ansible/hosts | 4 | ||||
| -rw-r--r-- | ansible/obbench.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/users/tasks/main.yml | 1 |
10 files changed, 26 insertions, 2 deletions
diff --git a/ansible/group_vars/ick-workers.yml b/ansible/group_vars/ick-workers.yml index b8f2755..21202ce 100644 --- a/ansible/group_vars/ick-workers.yml +++ b/ansible/group_vars/ick-workers.yml @@ -3,3 +3,4 @@ debian_mirror_src: null othermirror: http://code.liw.fi/debian pbuilder_ci_tgz: /var/cache/pbuilder/ci.tgz pbuilder_release_tgz: /var/cache/pbuilder/release.tgz +users: [] diff --git a/ansible/host_vars/debmirror.yml b/ansible/host_vars/debmirror.yml index 9afee6c..fa60976 100644 --- a/ansible/host_vars/debmirror.yml +++ b/ansible/host_vars/debmirror.yml @@ -1,2 +1,5 @@ codeliwfidistro: jessie mailname: debmirror.liw.fi +users: + - username: liw + gecos: Lars Wirzenius diff --git a/ansible/host_vars/e2obbench.yml b/ansible/host_vars/e2obbench.yml index 0da10c2..457c504 100644 --- a/ansible/host_vars/e2obbench.yml +++ b/ansible/host_vars/e2obbench.yml @@ -1 +1,6 @@ sshforward_port: 22055 +users: + - username: liw + gecos: Lars Wirzenius + - username: obbench + geocs: Obnam benchmark results diff --git a/ansible/host_vars/exolobe2.yml b/ansible/host_vars/exolobe2.yml index 978666f..fef027f 100644 --- a/ansible/host_vars/exolobe2.yml +++ b/ansible/host_vars/exolobe2.yml @@ -1 +1,4 @@ sshforward_port: 22044 +users: + - username: liw + gecos: Lars Wirzenius diff --git a/ansible/host_vars/holywood.yml b/ansible/host_vars/holywood.yml index 56d47aa..0fa3f70 100644 --- a/ansible/host_vars/holywood.yml +++ b/ansible/host_vars/holywood.yml @@ -1 +1,4 @@ sshforward_port: 22022 +users: + - username: liw + gecos: Lars Wirzenius diff --git a/ansible/host_vars/leonard.yml b/ansible/host_vars/leonard.yml index 58f2c58..31eab40 100644 --- a/ansible/host_vars/leonard.yml +++ b/ansible/host_vars/leonard.yml @@ -1,3 +1,6 @@ codeliwfidistro: unstable mailname: leonard.liw.fi sshforward_port: 22066 +users: + - username: liw + gecos: Lars Wirzenius diff --git a/ansible/host_vars/willikins.yml b/ansible/host_vars/willikins.yml index c5bc832..9f4f6a6 100644 --- a/ansible/host_vars/willikins.yml +++ b/ansible/host_vars/willikins.yml @@ -1 +1,4 @@ sshforward_port: 22033 +users: + - username: liw + gecos: Lars Wirzenius diff --git a/ansible/hosts b/ansible/hosts index 198829d..2784d4f 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -2,7 +2,7 @@ willikins hostname=willikins distro=jessie holywood hostname=holywood distro=jessie exolobe2 hostname=exolobe2 distro=jessie -exolobe3 hostname=exolobe3 distro=stretch ansible_ssh_host=127.0.0.1 +exolobe3 hostname=exolobe3 distro=stretch ansible_ssh_host=localhost debmirror hostname=debmirror distro=jessie leonard hostname=leonard distro=stretch e2obbench hostname=e2obbench distro=jessie @@ -12,7 +12,7 @@ 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 hostname=koom distro=stretch ansible_ssh_host=liw-pieni-pieni.dev.qvarnlabs.eu +pieni hostname=koom distro=stretch ansible_ssh_host=liw1-pieni.dev.qvarnlabs.eu [obbench] e2obbench diff --git a/ansible/obbench.yml b/ansible/obbench.yml index 2e144e8..889f4c5 100644 --- a/ansible/obbench.yml +++ b/ansible/obbench.yml @@ -1,6 +1,8 @@ - hosts: e2obbench remote_user: ansible become: yes + vars: + users: [] roles: - code.liw.fi-using-apt - sane-debian-system diff --git a/ansible/roles/users/tasks/main.yml b/ansible/roles/users/tasks/main.yml index 98ab78d..60d4726 100644 --- a/ansible/roles/users/tasks/main.yml +++ b/ansible/roles/users/tasks/main.yml @@ -1,6 +1,7 @@ - name: create users user: name: "{{ item.username }}" + comment: "{{ item.gecos }}" shell: /bin/bash password: "{{ lookup('pipe', 'pass show pieni.net/' + item.username + ' | mkpasswd -sm SHA-512') }}" with_items: "{{ users }}" |