clean up all the skvidalisms :)

This commit is contained in:
Seth Vidal 2012-10-08 19:48:36 +00:00
parent a605ca0f15
commit 0d88e62fa9
4 changed files with 9 additions and 11 deletions

View file

@ -1,4 +1,2 @@
--- ---
files: /home/fedora/skvidal/ansible/public/files/ files: /srv/web/infra/ansible/files
is_fedora: "'$ansible_distribution' == 'Fedora'"
is_rhel: "'$ansible_distribution' == 'RedHat'"

View file

@ -2,7 +2,7 @@
- hosts: 209.132.184.* - hosts: 209.132.184.*
user: root user: root
vars_files: vars_files:
- /home/fedora/skvidal/ansible/public/vars/global.yml - /srv/web/infra/ansible/vars/global.yml
- $vars/${ansible_distribution}.yml - $vars/${ansible_distribution}.yml
- $private/playbooks/vars.yml - $private/playbooks/vars.yml

View file

@ -2,13 +2,13 @@
- hosts: 209.132.184.* - hosts: 209.132.184.*
user: root user: root
vars_files: vars_files:
- /home/fedora/skvidal/ansible/public/vars/global.yml - /srv/web/infra/ansible/vars/global.yml
- $vars/${ansible_distribution}.yml - $vars/${ansible_distribution}.yml
- $private/playbooks/vars.yml - $private/playbooks/vars.yml
tasks: tasks:
- include: $tasks/cloud_setup_el6.yml - include: $tasks/cloud_setup_${dist_tag}.yml
- include: $tasks/jenkins_slave.yml - include: $tasks/jenkins_slave.yml

View file

@ -1,9 +1,9 @@
--- ---
private: /home/fedora/skvidal/ansible/private private: /srv/private/ansible
files: /home/fedora/skvidal/ansible/public/files files: /srv/web/infra/ansible/files
handlers: /home/fedora/skvidal/ansible/public/handlers handlers: /srv/web/infra/ansible/handlers
tasks: /home/fedora/skvidal/ansible/public/tasks tasks: /srv/web/infra/ansible/tasks
vars: /home/fedora/skvidal/ansible/public/vars vars: /srv/web/infra/ansible/vars
is_fedora: "'$ansible_distribution' == 'Fedora'" is_fedora: "'$ansible_distribution' == 'Fedora'"
is_rhel: "'$ansible_distribution' == 'RedHat'" is_rhel: "'$ansible_distribution' == 'RedHat'"
dist_tag: unknown dist_tag: unknown