aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/apt_repo/tasks/main.yml9
-rw-r--r--roles/my_workspace/tasks/project.yml2
2 files changed, 8 insertions, 3 deletions
diff --git a/roles/apt_repo/tasks/main.yml b/roles/apt_repo/tasks/main.yml
index 3ad7642..4c1d92f 100644
--- a/roles/apt_repo/tasks/main.yml
+++ b/roles/apt_repo/tasks/main.yml
@@ -21,11 +21,16 @@
dest: '{{ key_path }}'
mode: '644'
- - name: Get host distribution
+ - name: Get host distro
ansible.builtin.setup:
gather_subset: [distribution_release]
+ - name: Set repository defaults
+ ansible.builtin.set_fact:
+ apt_repo_distro: '{{ apt_repo_distro | default(ansible_distribution_release) }}'
+ apt_repo_component: '{{ apt_repo_component | default("main") }}'
+
- name: 'Add repository: {{ apt_repo_name }}'
ansible.builtin.apt_repository:
- repo: 'deb [signed-by={{ key_path }}] {{ apt_repo_url }} {{ apt_repo_distro | default(ansible_distribution_release) }} {{ apt_repo_component | default("main") }}'
+ repo: 'deb [signed-by={{ key_path }}] {{ apt_repo_url }} {{ apt_repo_distro }} {{ apt_repo_component }}'
filename: '{{ apt_repo_name }}'
diff --git a/roles/my_workspace/tasks/project.yml b/roles/my_workspace/tasks/project.yml
index ae139f5..f9a138a 100644
--- a/roles/my_workspace/tasks/project.yml
+++ b/roles/my_workspace/tasks/project.yml
@@ -33,7 +33,7 @@
chdir: '{{ project_dir }}'
register: make_output
when: makefile_check is succeeded
-
+
- name: Show make output
ansible.builtin.debug:
var: make_output