combine variables in main

victorock · Mar 6, 2019 · 392cafd · 392cafd
1 parent 3925a3e
commit 392cafd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/tasks/config.yml b/tasks/config.yml
@@ -1,6 +1,4 @@
-- name: "Configure Variables"
-  import_tasks: "config/variables.yml"
-
+---
 - name: "Configure Tower-CLI"
   import_tasks: "config/tower_cli.yml"
 

diff --git a/tasks/config/variables.yml b/tasks/config/variables.yml
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,5 +1,7 @@
 ---
+- name: "Combine Configuration Hashes from User and Role"
+  set_fact:
+    tower_config: "{{ _tower_config | combine(tower_config) }}"
+
 - name: "config.yml"
-  import_tasks: config.yml
-  environment:
-    PATH: "{{ _tower_config.awx_venv }}:{{ ansible_env.PATH }}"
+  import_tasks: config.yml