Fix global vars, work around an include issue

playbooks/groups/arm-qa.yml

@@ -9,7 +9,7 @@
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "{{ private }}/vars.yml"
-   - "{{ vars }}/{{ ansible_distribution }}.yml"
+   - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
 
   roles:
   - /srv/web/infra/ansible/roles/base

vars/Fedora.yml

@@ -1,5 +1,5 @@
 ---
-dist_tag: f${ansible_distribution_version}
+dist_tag: f{{ ansible_distribution_version }}
 base_pkgs_inst: ['iptables-services' ]
 base_pkgs_erase: ['firewalld', 'PackageKit*', 'sendmail', 'at']
 service_disabled: [ ]

vars/RedHat.yml

@@ -1,5 +1,5 @@
 ---
-dist_tag: el${ansible_distribution_version[0]}
+dist_tag: el{{ ansible_distribution_version[0] }}
 base_pkgs_inst: []
 base_pkgs_erase: ['firstboot-tui','bluez-utils', 'sendmail']
 service_disabled: []

vars/global.yml

@@ -8,7 +8,7 @@ roles: /srv/web/infra/ansible/roles
 handlers: /srv/web/infra/ansible/handlers
 tasks: /srv/web/infra/ansible/tasks
 vars:  /srv/web/infra/ansible/vars
-is_fedora: "'{{ ansible_distribution }}' == 'Fedora'"                      
+is_fedora: "'{{ ansible_distribution }}' == 'Fedora'"
 is_rhel:   "'{{ ansible_distribution }}' == 'RedHat'"
 dist_tag: unknown
 auth_keys_from_fas: '/srv/web/infra/ansible/scripts/auth-keys-from-fas'