Fix ansible deprecation messages

hosts

@@ -23,14 +23,14 @@ mex.mirror.pkgbuild.com
 sgp.mirror.pkgbuild.com
 ger.mirror.pkgbuild.com
 
-[archive-mirrors]
+[archive_mirrors]
 ind.mirror.pkgbuild.com
 jpn.mirror.pkgbuild.com
 mex.mirror.pkgbuild.com
 sgp.mirror.pkgbuild.com
 ger.mirror.pkgbuild.com
 
-[borg-clients]
+[borg_clients]
 orion.archlinux.org
 apollo.archlinux.org
 soyuz.archlinux.org
@@ -41,12 +41,12 @@ quassel.archlinux.org
 phrik.archlinux.org
 bbs.archlinux.org
 
-[mysql-servers]
+[mysql_servers]
 apollo.archlinux.org
 luna.archlinux.org
 bbs.archlinux.org
 
-[postgresql-servers]
+[postgresql_servers]
 apollo.archlinux.org
 soyuz.archlinux.org
 state.archlinux.org
@@ -63,7 +63,7 @@ dragon.archlinux.org
 soyuz.archlinux.org
 sgp.mirror.pkgbuild.com
 
-[gitlab-runners]
+[gitlab_runners]
 runner1.archlinux.org
 
 [reproduciblebuilds]

playbooks/all-hosts-basic.yml

@@ -11,6 +11,6 @@
     # reconfiguring sshd may break the AUR on luna (unchecked)
     #- { role: sshd, tags: ['sshd'] }
     - { role: root_ssh, tags: ['root_ssh'] }
-    - { role: borg-client, tags: ["borg"], when: "'borg-clients' in group_names" }
+    - { role: borg-client, tags: ["borg"], when: "'borg_clients' in group_names" }
     - { role: zabbix-agent, tags: ["zabbix", "zabbix-agent"], when: "'unmanaged' not in group_names" }
     - { role: hardening }

playbooks/archive-mirrors.yml

 ---
 - name: common playbook for archive-mirrors
-  hosts: archive-mirrors
+  hosts: archive_mirrors
   remote_user: root
   roles:
     - { role: common }

playbooks/gitlab-runners.yml

 ---
 - name: setup gitlab-runners
-  hosts: gitlab-runners
+  hosts: gitlab_runners
   remote_user: root
   roles:
     - { role: common }

playbooks/tasks/fetch-borg-keys.yml

@@ -6,7 +6,7 @@
       - file: path="{{playbook_dir}}/../../borg-keys/" state=directory
 
 - name: fetch borg keys
-  hosts: borg-clients
+  hosts: borg_clients
   tasks:
       - name: fetch borg key
         command: "/usr/local/bin/borg key export :: /dev/stdout"

playbooks/vostok.yml

@@ -9,4 +9,4 @@
     - { role: sshd, tags: ['sshd'] }
     - { role: unbound }
     - { role: root_ssh, tags: ['root_ssh'] }
-    - { role: borg-server, backup_dir: "/backup", backup_clients: "{{groups['borg-clients']}}", tags: ["borg"] }
+    - { role: borg-server, backup_dir: "/backup", backup_clients: "{{groups['borg_clients']}}", tags: ["borg"] }

roles/dbscripts/templates/rsyncd.conf.proto.j2

@@ -23,7 +23,7 @@ hosts deny = *
 [archive]
 	path = /srv/archive
 	comment = archive
-	hosts allow = {{ groups['archive-mirrors'] | map('extract', hostvars, ['ipv4_address']) | join(' ') }}
+	hosts allow = {{ groups['archive_mirrors'] | map('extract', hostvars, ['ipv4_address']) | join(' ') }}
 
 # Just the release/stable iso/packages (for most mirrors)
 [ftp]

roles/sshd/templates/motd.j2

 Welcome to {{inventory_hostname}}.
 
-{% if 'borg-clients' in group_names %}
+{% if 'borg_clients' in group_names %}
 Data on this system is regularly backed up automatically.
 {% else %}
 This system IS NOT backed up. Please ensure you DO NOT keep valuable data here!

roles/zabbix-agent/tasks/main.yml

@@ -11,7 +11,7 @@
 
 - name: install packages for borg monitoring
   pacman: name=perl-json
-  when: "'borg-clients' in group_names"
+  when: "'borg_clients' in group_names"
 
 - name: install packages for nginx monitoring
   pacman: name=perl-json,perl-clone,perl-statistics-descriptive
@@ -19,11 +19,11 @@
 
 - name: install mysql userstats monitoring packages
   pacman: name=perl-dbi,perl-dbd-mysql,perl-json
-  when: "'mysql-servers' in group_names"
+  when: "'mysql_servers' in group_names"
 
 - name: install postgresql userstats monitoring packages
   pacman: name=perl-dbi,perl-dbd-pg,perl-json
-  when: "'postgresql-servers' in group_names"
+  when: "'postgresql_servers' in group_names"
 
 - name: install memcached monitoring packages
   pacman: name=python-memcached