diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2014-01-01 21:53:09 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2014-01-01 21:53:09 +0000 |
| commit | a356dd16eb576f92c53ba48d5f270f5089e7eedf (patch) | |
| tree | 3711bfc6e44fd88b4e56e395de3c3566336abab7 | |
| parent | 7d0c6432af02b1269547a38b949ffe57f3f15e28 (diff) | |
| download | ansible-a356dd16eb576f92c53ba48d5f270f5089e7eedf.tar.gz ansible-a356dd16eb576f92c53ba48d5f270f5089e7eedf.tar.xz ansible-a356dd16eb576f92c53ba48d5f270f5089e7eedf.zip | |
Fix global vars, work around an include issue
| -rw-r--r-- | playbooks/groups/arm-qa.yml | 2 | ||||
| -rw-r--r-- | vars/Fedora.yml | 2 | ||||
| -rw-r--r-- | vars/RedHat.yml | 2 | ||||
| -rw-r--r-- | 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 c8fa2b57d..f1fd7cd7f 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 9b6162bd7..42f54a683 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 3c7e28907..15550a353 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 519744d96..1107f054f 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' |