From cc8c0b07837047a95d87910e20e125c17fe788db Mon Sep 17 00:00:00 2001
From: Federico Di Pierro <nierro92@gmail.com>
Date: Fri, 22 Nov 2024 11:22:20 +0100
Subject: [PATCH] fix(roles): add role prefix to scap-open vars.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
---
 ansible-playbooks/.ansible-lint-ignore           |  1 -
 ansible-playbooks/roles/scap_open/tasks/main.yml | 14 +++++++-------
 ansible-playbooks/roles/scap_open/vars/main.yml  |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 ansible-playbooks/.ansible-lint-ignore

diff --git a/ansible-playbooks/.ansible-lint-ignore b/ansible-playbooks/.ansible-lint-ignore
deleted file mode 100644
index 3f7c01e..0000000
--- a/ansible-playbooks/.ansible-lint-ignore
+++ /dev/null
@@ -1 +0,0 @@
-roles/scap_open/vars/main.yml var-naming # disable var-naming for scap-open.yml playbook
diff --git a/ansible-playbooks/roles/scap_open/tasks/main.yml b/ansible-playbooks/roles/scap_open/tasks/main.yml
index 17280e4..df9e9e5 100644
--- a/ansible-playbooks/roles/scap_open/tasks/main.yml
+++ b/ansible-playbooks/roles/scap_open/tasks/main.yml
@@ -24,15 +24,15 @@
   rescue:
     - name: Disable Modern Bpf support
       ansible.builtin.set_fact:
-        modern_bpf_supported: false
+        scap_open_modern_bpf_supported: false
       when: result.rc == 95
 
 - name: Check Old Bpf Support
   block:
     - name: Enable old Bpf support
       ansible.builtin.set_fact:
-        bpf_supported: true
-      when: ansible_kernel is version(bpf_minimum_kver[ansible_architecture],'>=')
+        scap_open_bpf_supported: true
+      when: ansible_kernel is version(scap_open_bpf_minimum_kver[ansible_architecture],'>=')
 
 - name: Prepare the build directory
   block:
@@ -50,7 +50,7 @@
              -DUSE_BUNDLED_DEPS=ON
              -DBUILD_LIBSCAP_MODERN_BPF=OFF
              -DBUILD_LIBSCAP_GVISOR=OFF
-             -DBUILD_BPF={{ bpf_supported }}
+             -DBUILD_BPF={{ scap_open_bpf_supported }}
              -DCREATE_TEST_TARGETS=OFF
              ..
         chdir: "{{ remote_repos_folder }}/repos/{{ repos['libs'].name }}/build"
@@ -139,7 +139,7 @@
         cmd: make bpf -j {{ cpus }}
         chdir: "{{ remote_repos_folder }}/repos/{{ repos['libs'].name }}/build"
       register: bpf_probe_result
-      when: bpf_supported
+      when: scap_open_bpf_supported
       changed_when: false
   rescue:
     - name: Print error message to stdout --- build bpf probe
@@ -161,7 +161,7 @@
         cmd: /tmp/scap-open --num_events 50 --bpf driver/bpf/probe.o
         chdir: "{{ remote_repos_folder }}/repos/{{ repos['libs'].name }}/build"
       register: result
-      when: bpf_supported
+      when: scap_open_bpf_supported
       changed_when: false
   rescue:
     - name: Print error message to stdout --- scap-open + bpf probe
@@ -183,7 +183,7 @@
         cmd: /tmp/scap-open --num_events 50 --modern_bpf
         chdir: "{{ remote_repos_folder }}/repos/{{ repos['libs'].name }}/build"
       register: result
-      when: modern_bpf_supported
+      when: scap_open_modern_bpf_supported
       changed_when: false
   rescue:
     - name: Print error message to stdout --- scap-open + modern probe
diff --git a/ansible-playbooks/roles/scap_open/vars/main.yml b/ansible-playbooks/roles/scap_open/vars/main.yml
index c1d3acd..6ff5681 100644
--- a/ansible-playbooks/roles/scap_open/vars/main.yml
+++ b/ansible-playbooks/roles/scap_open/vars/main.yml
@@ -1,6 +1,6 @@
 ---
-modern_bpf_supported: true
-bpf_supported: false
-bpf_minimum_kver:
+scap_open_modern_bpf_supported: true
+scap_open_bpf_supported: false
+scap_open_bpf_minimum_kver:
   aarch64: '4.17'
   x86_64: '4.14'