From a356dd16eb576f92c53ba48d5f270f5089e7eedf Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 1 Jan 2014 21:53:09 +0000
Subject: [PATCH] Fix global vars, work around an include issue

---
 playbooks/groups/arm-qa.yml | 2 +-
 vars/Fedora.yml             | 2 +-
 vars/RedHat.yml             | 2 +-
 vars/global.yml             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml
index c8fa2b57db..f1fd7cd7f8 100644
--- a/playbooks/groups/arm-qa.yml
+++ b/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
diff --git a/vars/Fedora.yml b/vars/Fedora.yml
index 9b6162bd75..42f54a6837 100644
--- a/vars/Fedora.yml
+++ b/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: [ ]
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 3c7e289077..15550a353e 100644
--- a/vars/RedHat.yml
+++ b/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: []
diff --git a/vars/global.yml b/vars/global.yml
index 519744d969..1107f054f3 100644
--- a/vars/global.yml
+++ b/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'