diff options
| author | Jonathan Bauer | 2020-05-14 16:43:56 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2020-05-14 16:43:56 +0200 |
| commit | 66c4fe32a90442e7695dfa2adf3603f25ed78050 (patch) | |
| tree | 21f02dc5611527f1d5fdc46f318be58aa7f5f394 | |
| parent | change branch for CentOS-8 (diff) | |
| download | ansible-dracut-66c4fe32a90442e7695dfa2adf3603f25ed78050.tar.gz ansible-dracut-66c4fe32a90442e7695dfa2adf3603f25ed78050.tar.xz ansible-dracut-66c4fe32a90442e7695dfa2adf3603f25ed78050.zip | |
explicitely set role_path when including
| -rw-r--r-- | setup-dev-tools/tasks/main.yml | 6 | ||||
| -rw-r--r-- | slx-builder/tasks/install.yml | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/setup-dev-tools/tasks/main.yml b/setup-dev-tools/tasks/main.yml index 8dbb196..a88c128 100644 --- a/setup-dev-tools/tasks/main.yml +++ b/setup-dev-tools/tasks/main.yml @@ -2,6 +2,6 @@ - name: DevTools | Get distro specific tasks include_tasks: "{{ item }}" with_first_found: - - "tasks/distro/{{ ansible_distribution }}-{{ ansible_distribution_version}}.yml" - - "tasks/distro/{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml" - - "tasks/distro/{{ ansible_distribution }}.yml" + - "{{ role_path }}/tasks/distro/{{ ansible_distribution }}-{{ ansible_distribution_version}}.yml" + - "{{ role_path }}/tasks/distro/{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml" + - "{{ role_path }}/tasks/distro/{{ ansible_distribution }}.yml" diff --git a/slx-builder/tasks/install.yml b/slx-builder/tasks/install.yml index b31eef3..2cc56d7 100644 --- a/slx-builder/tasks/install.yml +++ b/slx-builder/tasks/install.yml @@ -13,16 +13,16 @@ - name: OpenSLX dracut | Get distro specific tasks include_tasks: "{{ item }}" with_first_found: - - "tasks/distro/{{ ansible_distribution }}-{{ ansible_distribution_version}}.yml" - - "tasks/distro/{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml" - - "tasks/distro/{{ ansible_distribution }}.yml" + - "{{ role_path }}/tasks/distro/{{ ansible_distribution }}-{{ ansible_distribution_version}}.yml" + - "{{ role_path }}/tasks/distro/{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml" + - "{{ role_path }}/tasks/distro/{{ ansible_distribution }}.yml" - name: OpenSLX dracut | Include distro variables include_vars: "{{ item }}" with_first_found: - - "vars/distro/{{ ansible_distribution }}-{{ ansible_distribution_version}}.yml" - - "vars/distro/{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml" - - "vars/distro/{{ ansible_distribution }}.yml" + - "{{ role_path }}/vars/distro/{{ ansible_distribution }}-{{ ansible_distribution_version}}.yml" + - "{{ role_path }}/vars/distro/{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml" + - "{{ role_path }}/vars/distro/{{ ansible_distribution }}.yml" - name: OpenSLX dracut | Initialize repository shell: "{{ builder_path }} --init --debug {{ builder_extra_args }}" |