diff options
| author | Lars Wirzenius <liw@liw.fi> | 2023-10-28 07:42:25 +0000 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2023-10-28 07:42:25 +0000 |
| commit | 5827af750de2c7f57be4c750fc1425300038e66a (patch) | |
| tree | 3c0860952379ec1aad9ca377d83df5580af1b3b2 | |
| parent | f1d82152742d9c2b6e35c15e65331775307652ce (diff) | |
| parent | 97518a6ed965ce769bcfd598502451ea5c9c38f1 (diff) | |
| download | puomi-5827af750de2c7f57be4c750fc1425300038e66a.tar.gz | |
Merge branch 'liw/improvements' into 'main'
improvements to make deployment nicer
See merge request larswirzenius/puomi!22
| -rw-r--r-- | puomi-playbook.yml | 10 | ||||
| -rw-r--r-- | roles/puomi/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/puomi/tasks/main.yml | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/puomi-playbook.yml b/puomi-playbook.yml index 7e6e0ba..0e9cbc3 100644 --- a/puomi-playbook.yml +++ b/puomi-playbook.yml @@ -11,7 +11,8 @@ - name: "add contrib and non-free to APT sources, for firmware" apt_repository: - repo: "deb http://deb.debian.org/debian bullseye contrib non-free" + repo: | + deb http://deb.debian.org/debian {{ hostvars[inventory_hostname]["ansible_distribution_release"] }} contrib non-free - name: "install software" apt: @@ -73,9 +74,8 @@ vars: ansible_python_interpreter: /usr/bin/python3 - puomi_lan_ip: 10.1.1.1 - puomi_dhcp_start: 10.1.1.10 - puomi_dhcp_end: 10.1.1.250 + puomi_lan_ip: 10.3.1.1 + puomi_dhcp_start: 10.3.1.10 + puomi_dhcp_end: 10.3.1.250 puomi_dhcp_netmask: 255.255.255.0 puomi_dhcp_lease: 1h - diff --git a/roles/puomi/defaults/main.yml b/roles/puomi/defaults/main.yml index a654386..f6c8a77 100644 --- a/roles/puomi/defaults/main.yml +++ b/roles/puomi/defaults/main.yml @@ -1,5 +1,3 @@ -puomi_version: 1 - puomi_lan_ip: 10.2.2.1 puomi_dhcp_start: 10.2.2.10 puomi_dhcp_end: 10.2.2.250 diff --git a/roles/puomi/tasks/main.yml b/roles/puomi/tasks/main.yml index d6385f6..ccc3c77 100644 --- a/roles/puomi/tasks/main.yml +++ b/roles/puomi/tasks/main.yml @@ -1,13 +1,15 @@ # Ansible role for installing a Puomi router. - name: "puomi: check role version" + when: puomi_version != 1 shell: | - [ "{{ puomi_version }}" = "1" ] || \ - (echo "Unexpected version {{ puomi_version }}" 1>&2; exit 1) + echo "Unexpected version {{ puomi_version }}" + exit 1 - name: "puomi: add contrib and non-free to APT sources, for firmware" apt_repository: - repo: "deb http://deb.debian.org/debian bullseye contrib non-free" + repo: | + deb http://deb.debian.org/debian {{ hostvars[inventory_hostname]["ansible_distribution_release"] }} contrib non-free - name: "puomi: install necessary or useful software for a router" apt: |