Merge pull request #8 from victorock/dev

v0.1b
victorock · Mar 6, 2019 · fc06f53 · fc06f53
2 parents 7153916 + 392cafd
commit fc06f53
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Simple Role to Configure Ansible Tower by Red Hat.
 Requirements
 ------------
 
-None
+`ansible-tower-cli`
 
 Role Variables
 --------------
@@ -280,15 +280,8 @@ tower_config:
 Dependencies
 ------------
 
-The following dependencies are defined in `meta/main.yml`:
-
-```YAML
-dependencies:
-  - role: geerlingguy.pip
-    pip_install_packages:
-      - name: ansible-tower-cli
+None
 
-```
 Example Playbook
 ----------------
 

diff --git a/meta/main.yml b/meta/main.yml
@@ -1,7 +1,4 @@
-dependencies:
-  - role: geerlingguy.pip
-    pip_install_packages:
-      - name: ansible-tower-cli
+dependencies: []
 
 galaxy_info:
   role_name: tower_config

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