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