From 5c338a0bd0b9050217a541806c90ac85b510be93 Mon Sep 17 00:00:00 2001
From: Alexandru Anghel <alexandru.anghel@gmail.com>
Date: Mon, 12 Nov 2018 22:34:15 +0000
Subject: [PATCH] Removed the need to use vars_files with relative paths.

---
 build_cloud.sh                       | 6 +++++-
 playbooks/clouds/build_aws.yml       | 3 ---
 playbooks/clouds/build_azure.yml     | 3 ---
 playbooks/clouds/build_gce.yml       | 3 ---
 playbooks/clouds/build_openstack.yml | 3 ---
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/build_cloud.sh b/build_cloud.sh
index 1983b902..80335368 100755
--- a/build_cloud.sh
+++ b/build_cloud.sh
@@ -12,4 +12,8 @@ aws|azure|gce|openstack)
   ;;
 esac
 
-ansible-playbook --connection=local "playbooks/clouds/build_${cloud_to_use}.yml" "$@"
+ansible-playbook "playbooks/clouds/build_${cloud_to_use}.yml" \
+                 --connection=local \
+                 --extra-vars="@playbooks/group_vars/all" \
+                 --extra-vars="@inventory/${cloud_to_use}/group_vars/all" \
+                 "$@"
diff --git a/playbooks/clouds/build_aws.yml b/playbooks/clouds/build_aws.yml
index 31333e2c..06c82d38 100644
--- a/playbooks/clouds/build_aws.yml
+++ b/playbooks/clouds/build_aws.yml
@@ -3,9 +3,6 @@
   hosts: localhost
   connection: local
   gather_facts: False
-  vars_files:
-    - ../group_vars/all
-    - ../../inventory/aws/group_vars/all
   tasks:
     - name: Create the VPC
       ec2_vpc_net:
diff --git a/playbooks/clouds/build_azure.yml b/playbooks/clouds/build_azure.yml
index 9be8e62f..8bc5a523 100644
--- a/playbooks/clouds/build_azure.yml
+++ b/playbooks/clouds/build_azure.yml
@@ -3,9 +3,6 @@
   hosts: localhost
   connection: local
   gather_facts: False
-  vars_files:
-    - ../group_vars/all
-    - ../../inventory/azure/group_vars/all
   tasks:
     - name: Build {{ cloud_config.resource_group }} Resource Group
       azure_rm_resourcegroup:
diff --git a/playbooks/clouds/build_gce.yml b/playbooks/clouds/build_gce.yml
index 8f9f6058..b0506350 100644
--- a/playbooks/clouds/build_gce.yml
+++ b/playbooks/clouds/build_gce.yml
@@ -3,9 +3,6 @@
   hosts: localhost
   connection: local
   gather_facts: False
-  vars_files:
-    - ../group_vars/all
-    - ../../inventory/gce/group_vars/all
   tasks:
     - name: Create the {{ cloud_config.vpc_name }} VPC network
       gce_net:
diff --git a/playbooks/clouds/build_openstack.yml b/playbooks/clouds/build_openstack.yml
index 925bd34b..bc7b8581 100644
--- a/playbooks/clouds/build_openstack.yml
+++ b/playbooks/clouds/build_openstack.yml
@@ -3,9 +3,6 @@
   hosts: localhost
   connection: local
   gather_facts: False
-  vars_files:
-    - ../group_vars/all
-    - ../../inventory/openstack/group_vars/all
   tasks:
     - name: Build Openstack Nodes
       include_tasks: build_openstack_nodes.yml