From a092bfd947773281a23419ee0ab62358371b7166 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Wed, 22 Jan 2020 02:12:24 +0100 Subject: tr/-/_/ in group names. This avoids [DEPRECATION WARNING]: The TRANSFORM_INVALID_GROUP_CHARS settings is set to allow bad characters in group names by default, this will change, but still be user configurable on deprecation. This feature will be removed in version 2.10. Deprecation warnings can be disabled by setting deprecation_warnings=False in ansible.cfg. [WARNING]: Invalid characters were found in group names but not replaced, use -vvvv to see details --- bacula.yml | 4 ++-- common.yml | 8 ++++---- munin.yml | 2 +- production | 10 +++++----- roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2 | 12 ++++++------ roles/bacula-sd/templates/etc/bacula/bacula-sd.conf.j2 | 2 +- roles/common/templates/etc/bacula/bacula-fd.conf.j2 | 2 +- roles/common/templates/etc/munin/munin-node.conf.j2 | 2 +- roles/common/templates/etc/ntp.conf.j2 | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bacula.yml b/bacula.yml index 3b2eaa9..c8f2406 100644 --- a/bacula.yml +++ b/bacula.yml @@ -1,6 +1,6 @@ --- - name: Configure the Bacula Director - hosts: bacula-dir + hosts: bacula_dir tags: - bacula - bacula-dir @@ -8,7 +8,7 @@ - bacula-dir - name: Configure the Bacula Storage Daemon - hosts: bacula-sd + hosts: bacula_sd tags: - bacula - bacula-sd diff --git a/common.yml b/common.yml index f670699..aa135ca 100644 --- a/common.yml +++ b/common.yml @@ -23,28 +23,28 @@ - ACME - name: Common SQL tasks - hosts: MDA:webmail:lists:bacula-dir:nextcloud + hosts: MDA:webmail:lists:bacula_dir:nextcloud gather_facts: False tags: mysql,sql roles: - common-SQL - name: Common LDAP tasks - hosts: MDA:MSA:LDAP-provider:MX + hosts: MDA:MSA:LDAP_provider:MX gather_facts: True tags: slapd,ldap roles: - common-LDAP - name: Configure the LDAP provider - hosts: LDAP-provider + hosts: LDAP_provider gather_facts: False tags: slapd,ldap roles: - LDAP-provider - name: Configure the Web servers - hosts: webmail:wiki:lists:git:munin-master:nextcloud + hosts: webmail:wiki:lists:git:munin_master:nextcloud gather_facts: False tags: nginx,www,web roles: diff --git a/munin.yml b/munin.yml index 317bfea..83790f5 100644 --- a/munin.yml +++ b/munin.yml @@ -1,6 +1,6 @@ --- - name: Configure the Munin master - hosts: munin-master + hosts: munin_master tags: - munin - munin-master diff --git a/production b/production index 92eae30..0ce2b4e 100644 --- a/production +++ b/production @@ -21,10 +21,10 @@ calima.fripost.org geoip=se # ldap.fripost.org -[LDAP-provider:children] +[LDAP_provider:children] mistral -[NTP-master:children] +[NTP_master:children] mistral # imap.fripost.org @@ -48,10 +48,10 @@ IMAP [out:children] giraff -[bacula-dir:children] +[bacula_dir:children] benjamin -[bacula-sd:children] +[bacula_sd:children] benjamin # webmail.fripost.org @@ -71,7 +71,7 @@ wiki [nextcloud:children] calima -[munin-master:children] +[munin_master:children] benjamin diff --git a/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2 b/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2 index ee01930..f2ffd17 100644 --- a/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2 +++ b/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2 @@ -22,7 +22,7 @@ JobDefs { Name = DefaultJob Type = Backup Level = Incremental - Storage = {{ hostvars[ groups['bacula-sd'][0] ].inventory_hostname_short }}-sd + Storage = {{ hostvars[ groups['bacula_sd'][0] ].inventory_hostname_short }}-sd Messages = Standard Accurate = yes #Rerun Failed Levels = yes @@ -38,7 +38,7 @@ JobDefs { Name = DefaultMySQLJob Type = Backup Level = Full - Storage = {{ hostvars[ groups['bacula-sd'][0] ].inventory_hostname_short }}-sd + Storage = {{ hostvars[ groups['bacula_sd'][0] ].inventory_hostname_short }}-sd Messages = Standard FileSet = SQL Schedule = WeeklyCycleAfterBackup @@ -64,7 +64,7 @@ JobDefs { Name = DefaultSlapdJob Type = Backup Level = Full - Storage = {{ hostvars[ groups['bacula-sd'][0] ].inventory_hostname_short }}-sd + Storage = {{ hostvars[ groups['bacula_sd'][0] ].inventory_hostname_short }}-sd Messages = Standard FileSet = LDAP Schedule = WeeklyCycleAfterBackup @@ -125,7 +125,7 @@ Job { } {% endfor %} -{% for fd in groups['MDA'] | union(groups['webmail']) | union(groups['lists']) | union(groups['bacula-dir']) | union(groups['nextcloud']) | sort %} +{% for fd in groups['MDA'] | union(groups['webmail']) | union(groups['lists']) | union(groups['bacula_dir']) | union(groups['nextcloud']) | sort %} Job { Name = {{ hostvars[fd].inventory_hostname_short }}-mysql Client = {{ hostvars[fd].inventory_hostname_short }}-fd @@ -150,7 +150,7 @@ Job { Type = Restore Client= {{ inventory_hostname_short }}-fd FileSet = FileSetRoot - Storage = {{ hostvars[ groups['bacula-sd'][0] ].inventory_hostname_short }}-sd + Storage = {{ hostvars[ groups['bacula_sd'][0] ].inventory_hostname_short }}-sd Pool = Default Messages = Standard # NOTE: Files are put on the client (FD) that is being restored. @@ -385,7 +385,7 @@ Client { # Definition of file storage device -{% for sd in groups['bacula-sd'] | sort %} +{% for sd in groups['bacula_sd'] | sort %} Storage { Name = {{ hostvars[sd].inventory_hostname_short }}-sd Address = {{ ipsec[ hostvars[sd].inventory_hostname_short ] }} diff --git a/roles/bacula-sd/templates/etc/bacula/bacula-sd.conf.j2 b/roles/bacula-sd/templates/etc/bacula/bacula-sd.conf.j2 index 5ffa17c..3cbf7fe 100644 --- a/roles/bacula-sd/templates/etc/bacula/bacula-sd.conf.j2 +++ b/roles/bacula-sd/templates/etc/bacula/bacula-sd.conf.j2 @@ -22,7 +22,7 @@ Storage { # define myself # # List Directors who are permitted to contact Storage daemon # -{% for dir in groups['bacula-dir'] | sort %} +{% for dir in groups['bacula_dir'] | sort %} Director { Name = {{ hostvars[dir].inventory_hostname_short }}-dir @|"sed -n '/^{{ hostvars[dir].inventory_hostname_short }}-dir\\s/ {s//Password = /p; q}' /etc/bacula/passwords-sd" diff --git a/roles/common/templates/etc/bacula/bacula-fd.conf.j2 b/roles/common/templates/etc/bacula/bacula-fd.conf.j2 index d64ac86..e06911f 100644 --- a/roles/common/templates/etc/bacula/bacula-fd.conf.j2 +++ b/roles/common/templates/etc/bacula/bacula-fd.conf.j2 @@ -6,7 +6,7 @@ # # List Directors who are permitted to contact this File daemon # -{% for dir in groups['bacula-dir'] | sort %} +{% for dir in groups['bacula_dir'] | sort %} Director { Name = {{ hostvars[dir].inventory_hostname_short }}-dir @|"sed -n '/^{{ hostvars[dir].inventory_hostname_short }}-dir\\s/ {s//Password = /p; q}' /etc/bacula/passwords-fd" diff --git a/roles/common/templates/etc/munin/munin-node.conf.j2 b/roles/common/templates/etc/munin/munin-node.conf.j2 index d0004b7..1563526 100644 --- a/roles/common/templates/etc/munin/munin-node.conf.j2 +++ b/roles/common/templates/etc/munin/munin-node.conf.j2 @@ -41,7 +41,7 @@ host_name {{ inventory_hostname_short }} # network notation unless the perl module Net::CIDR is installed. You # may repeat the allow line as many times as you'd like -{% for host in groups['munin-master'] %} +{% for host in groups['munin_master'] %} allow ^{{ ipsec[ hostvars[host].inventory_hostname_short ] | ipv4 | replace(".","\.") }}$ {% endfor %} diff --git a/roles/common/templates/etc/ntp.conf.j2 b/roles/common/templates/etc/ntp.conf.j2 index 7bd1c4a..18c03cf 100644 --- a/roles/common/templates/etc/ntp.conf.j2 +++ b/roles/common/templates/etc/ntp.conf.j2 @@ -13,7 +13,7 @@ filegen clockstats file clockstats type day enable # You do need to talk to an NTP server or two (or three). -{% if 'NTP-master' in group_names %} +{% if 'NTP_master' in group_names %} # Use Stratum One Time Servers: # http://support.ntp.org/bin/view/Servers/StratumOneTimeServers server sth1.ntp.se iburst @@ -25,7 +25,7 @@ server ntp2.sp.se iburst {% else %} # Sychronize to our (stratum 2) NTP server, to ensure our network has a # consistent time. -{% for host in groups['NTP-master'] | sort %} +{% for host in groups['NTP_master'] | sort %} server {{ ipsec[ hostvars[host].inventory_hostname_short ] }} prefer iburst {% endfor %} pool 0.{{ geoip | default('debian') }}.pool.ntp.org iburst -- cgit v1.2.3