From 73bad4a8f0313ae0cb46611ca26cfa1c3953e794 Mon Sep 17 00:00:00 2001 From: Victor da Costa Date: Wed, 6 Mar 2019 01:51:51 +0100 Subject: [PATCH 1/3] remove pip dependency --- meta/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 0fd1c17..c0b1d9b 100644 --- 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 From 3925a3ef42dac737402906a3c0e12682df56633c Mon Sep 17 00:00:00 2001 From: Victor da Costa Date: Wed, 6 Mar 2019 02:24:08 +0100 Subject: [PATCH 2/3] update dependencies --- README.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a55bc6c..3eee2e8 100644 --- 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 ---------------- From 392cafdddb9d95d9c090ff7a1ab3c726bb5c3ab4 Mon Sep 17 00:00:00 2001 From: Victor da Costa Date: Wed, 6 Mar 2019 03:31:15 +0100 Subject: [PATCH 3/3] combine variables in main --- tasks/config.yml | 4 +--- tasks/config/variables.yml | 3 --- tasks/main.yml | 8 +++++--- 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 tasks/config/variables.yml diff --git a/tasks/config.yml b/tasks/config.yml index f54e99b..864fac2 100644 --- 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 deleted file mode 100644 index e3ec535..0000000 --- a/tasks/config/variables.yml +++ /dev/null @@ -1,3 +0,0 @@ -- name: "config.variables: Combine Configuration Hashes from User and Role" - set_fact: - tower_config: "{{ _tower_config | combine( tower_config ) }}" diff --git a/tasks/main.yml b/tasks/main.yml index 0f1686b..7d878bc 100644 --- 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 \ No newline at end of file