put all of our global vars in the 'all' group var

test out how well this will work for all imports and vars using el6-temp-instance
This commit is contained in:
Seth Vidal 2013-03-06 20:55:09 +00:00
parent 9b897d5245
commit 70cb8c7342
2 changed files with 16 additions and 4 deletions

View file

@ -1,4 +1,17 @@
---
files: /srv/web/infra/ansible/files
is_not: "'$ansible_distribution' == 'Fedora'"
basedir: /srv/web/infra/ansible
private: /srv/private/ansible
files: /srv/web/infra/ansible/files
handlers: /srv/web/infra/ansible/handlers
tasks: /srv/web/infra/ansible/tasks
vars: /srv/web/infra/ansible/vars
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'
el6_qcow_id: ami-00000013
f18_qcow_id: ami-00000016
el6_ami_id: ami-0000000e
f17_qcow_id: ami-00000001

View file

@ -7,12 +7,12 @@
gather_facts: False
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- ${private}/vars.yml
vars:
- keypair: fedora-admin
- image: $el6_qcow_id
- instance_type: m1.medium
- instance_type: m1.small
- security_group: default
tasks:
@ -24,7 +24,6 @@
gather_facts: True
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- ${private}/vars.yml
- ${vars}/${ansible_distribution}.yml