Skip to content

Commit

Permalink
Consistency changes
Browse files Browse the repository at this point in the history
  • Loading branch information
tersmitten committed Sep 20, 2023
1 parent d4cc3a9 commit befaaa7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
- name: include vars
ansible.builtin.include_vars: "{{ playbook_dir }}/../../vars/main.yml"
- name: include tasks
ansible.builtin.include: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
9 changes: 6 additions & 3 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# tasks file
---
- ansible.builtin.include: install-native.yml
- name: install native
ansible.builtin.import_tasks: install-native.yml
when: duplicity_install_method == 'native'
tags:
- configuration
- duplicity
- duplicity-install-native

- ansible.builtin.include: install-ppa.yml
- name: install ppa
ansible.builtin.import_tasks: install-ppa.yml
when: duplicity_install_method == 'ppa'
tags:
- configuration
- duplicity
- duplicity-install-ppa

- ansible.builtin.include: install-pip.yml
- name: install pip
ansible.builtin.import_tasks: install-pip.yml
when: duplicity_install_method == 'pip'
tags:
- configuration
Expand Down
2 changes: 1 addition & 1 deletion tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
- "{{ playbook_dir }}/vars/_{{ ansible_distribution | lower }}.yml"
- "{{ playbook_dir }}/vars/_default.yml"
- name: include tasks
ansible.builtin.include: "{{ playbook_dir }}/tasks/pre.yml"
ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
roles:
- ../../
2 changes: 1 addition & 1 deletion tests/vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
- "{{ playbook_dir }}/vars/_{{ ansible_distribution | lower }}.yml"
- "{{ playbook_dir }}/vars/_default.yml"
- name: include tasks
ansible.builtin.include: "{{ playbook_dir }}/tasks/pre.yml"
ansible.builtin.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
roles:
- ../../

0 comments on commit befaaa7

Please sign in to comment.