Removed the need to use vars_files with relative paths.

laurentedel · Nov 12, 2018 · 5c338a0 · 5c338a0
1 parent f259d61
commit 5c338a0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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