diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 04992e2ff5..a9bec8791d 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -1,16 +1,3 @@ --- -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 +#no vars here diff --git a/playbooks/el6-temp-instance.yml b/playbooks/el6-temp-instance.yml index 66c8295aad..e8ad77bab3 100644 --- a/playbooks/el6-temp-instance.yml +++ b/playbooks/el6-temp-instance.yml @@ -7,6 +7,7 @@ gather_facts: False vars_files: + - /srv/web/infra/ansible/vars/global.yml - ${private}/vars.yml vars: