From 7fa10cf59b28c7c503c0731ef8b36d0c011e7171 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 13 Jun 2022 17:06:33 -0700
Subject: [PATCH] Revert "cloud-noc01: test fixing passing vars to task and
 abstract paths out"

This reverts commit d59a7c2c44580c26bb84404d7a1a1d966702b65c.
---
 inventory/group_vars/all                             |  1 -
 playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 343fcf23b0..5cbcde5607 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -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
 #
diff --git a/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml b/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml
index 5be725d376..96b0c4fd0f 100644
--- a/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml
+++ b/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml
@@ -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