Merge pull request 'Fixing Ansible lint once and for all' (#14) from fix_ansible_lint into master
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: Aurore/ansible#14
Reviewed-by: ynerant <ynerant@noreply.localhost>
This commit is contained in:
otthorn 2021-02-07 18:09:27 +01:00
commit c2d33d594b
13 changed files with 10 additions and 13 deletions

View file

@ -2,6 +2,4 @@ skip_list:
- '301' - '301'
warn_list: warn_list:
- '305' # Use shell only when shell functionality is required
- '503' # Tasks that run when changed should likely be handlers
- experimental # all rules tagged as experimental - experimental # all rules tagged as experimental

View file

@ -15,5 +15,5 @@ steps:
commands: commands:
- apk add --no-cache gcc libc-dev libffi-dev openssl-dev - apk add --no-cache gcc libc-dev libffi-dev openssl-dev
- pip install ansible-lint==4.3.7 - pip install ansible-lint==4.3.7
- ansible-lint *.yml - ansible-lint
... ...

View file

@ -43,7 +43,7 @@
# username: service-user # username: service-user
# password: "{{ vault_serviceuser_passwd }}" # password: "{{ vault_serviceuser_passwd }}"
# roles: # roles:
# - re2o-service # - re2o_service
# Deploy Unifi Controller # Deploy Unifi Controller
@ -62,4 +62,4 @@
# username: service-user # username: service-user
# password: "{{ vault_serviceuser_passwd }}" # password: "{{ vault_serviceuser_passwd }}"
# roles: # roles:
# - re2o-service # - re2o_service

View file

@ -1,6 +1,6 @@
--- ---
- name: force run dhcp re2o-service - name: force run dhcp re2o-service
shell: /var/local/re2o-services/dhcp/main.py --force command: /var/local/re2o-services/dhcp/main.py --force
become_user: re2o-services become_user: re2o-services
- name: restart dhcpd - name: restart dhcpd

View file

@ -1,7 +1,7 @@
--- ---
- name: Install dhcp (re2o-service) - name: Install dhcp (re2o-service)
import_role: import_role:
name: re2o-service name: re2o_service
vars: vars:
service_repo: https://gitlab.federez.net/re2o/dhcp.git service_repo: https://gitlab.federez.net/re2o/dhcp.git
service_name: dhcp service_name: dhcp
@ -18,7 +18,7 @@
owner: re2o-services owner: re2o-services
group: nogroup group: nogroup
recurse: true recurse: true
mode: 755 mode: 0755
- name: Install isc-dhcp-server - name: Install isc-dhcp-server
apt: apt:

View file

@ -106,12 +106,11 @@
- name: Install radius requirements (except freeradius-python3) - name: Install radius requirements (except freeradius-python3)
shell: shell:
cmd: "{{ item }}" cmd: "cat apt_requirements_radius.txt | grep -v freeradius-python3 | xargs apt-get -y install"
chdir: /var/www/re2o/ chdir: /var/www/re2o/
loop:
- "cat apt_requirements_radius.txt | grep -v freeradius-python3 | xargs apt-get -y install"
- "pip3 install -r pip_requirements.txt"
- name: Install PyPi requirements for radius
command: "pip3 install -r /var/www/re2o/pip_requirements.txt"
# End of hideousness (hopefully). # End of hideousness (hopefully).

View file

@ -40,7 +40,7 @@
- name: Install aurore-firewall (re2o-service) - name: Install aurore-firewall (re2o-service)
import_role: import_role:
name: re2o-service name: re2o_service
vars: vars:
service_repo: https://gitea.auro.re/Aurore/aurore-firewall.git service_repo: https://gitea.auro.re/Aurore/aurore-firewall.git
service_name: aurore-firewall service_name: aurore-firewall