Merge pull request #69 from samvarankashyap/master

fixed PR #68 schema_check cannot find default schema outside linch-pin
CentOS-PaaS-SIG · Oct 5, 2016 · e668e67 · e668e67
2 parents 7b9daac + b75dae7
commit e668e67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/linchpin_config.yml b/linchpin_config.yml
@@ -8,11 +8,12 @@ inventory_playbooks:
 async: false
 async_timeout : 1000
 no_output : false
-schema: "ex_schemas/schema_v2.json"
+schema: "{{ playbook_dir }}/../ex_schemas/schema_v2.json"
 inventory_layouts_path: "inventory_layouts"
 inventory_outputs_path: "inventory_outputs"
 inventory_types: 
   - "aws"
   - "gcloud"
   - "openstack"
   - "generic"
+check_mode: no
diff --git a/provision/roles/common/tasks/main.yml b/provision/roles/common/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # This playbook contains common play that will be ran before the provisioning starts.
 - name: "Including Linchpin config vars"
-  include_vars: "../linchpin_config.yml"
+  include_vars: "{{ playbook_dir }}/../linchpin_config.yml"
 
 - name: "schema check for given topology file"
   schema_check: