Revert "cloud-noc01: test fixing passing vars to task and abstract paths out"

This reverts commit d59a7c2c44.
This commit is contained in:
Kevin Fenzi 2022-06-13 17:06:33 -07:00
parent d59a7c2c44
commit 7fa10cf59b
2 changed files with 4 additions and 7 deletions

View file

@ -18,7 +18,6 @@ ansible_ifcfg_disabled: []
# qa02.qa it's em3. currently this only affects whether GATEWAY, DOMAIN
# and DNS1/DNS2 lines are put into ifcfg-(device).
ansible_ifcfg_infra_net_devices: ['eth0', 'enc900']
ansible_private: /srv/private
#
# Autodetect python version
#

View file

@ -1,8 +1,6 @@
# This is a basic playbook
- import_playbook: "{{ ansible_base }}ansible/playbooks/include/virt-create.yml"
vars:
myhosts: cloud-noc01.fedorainfracloud.org
- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=cloud-noc01.fedorainfracloud.org"
- name: make cloud noc hardware
hosts: cloud-noc01.fedorainfracloud.org
@ -10,9 +8,9 @@
gather_facts: True
vars_files:
- "{{ ansible_base }}/ansible/vars/global.yml"
- "{{ ansible_private }}/ansible/vars.yml"
- "{{ ansible_base }}/ansible/vars/{{ ansible_distribution }}.yml"
- /srv/web/infra/ansible/vars/global.yml
- "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles:
- base