From d59a7c2c44580c26bb84404d7a1a1d966702b65c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 13 Jun 2022 16:33:10 -0700 Subject: [PATCH] cloud-noc01: test fixing passing vars to task and abstract paths out Signed-off-by: Kevin Fenzi --- inventory/group_vars/all | 1 + playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 5cbcde5607..343fcf23b0 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -18,6 +18,7 @@ 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 96b0c4fd0f..5be725d376 100644 --- a/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml +++ b/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml @@ -1,6 +1,8 @@ # This is a basic playbook -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=cloud-noc01.fedorainfracloud.org" +- import_playbook: "{{ ansible_base }}ansible/playbooks/include/virt-create.yml" + vars: + myhosts: cloud-noc01.fedorainfracloud.org - name: make cloud noc hardware hosts: cloud-noc01.fedorainfracloud.org @@ -8,9 +10,9 @@ gather_facts: True vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + - "{{ ansible_base }}/ansible/vars/global.yml" + - "{{ ansible_private }}/ansible/vars.yml" + - "{{ ansible_base }}/ansible/vars/{{ ansible_distribution }}.yml" roles: - base