From 170809bbf0f84e716ece473cbfc30b5847810ed5 Mon Sep 17 00:00:00 2001
From: Matej Focko <mfocko@redhat.com>
Date: Wed, 11 Oct 2023 16:25:43 +0200
Subject: [PATCH] fix(ansible): fix the naming of the variable

Ansible linting requires variables to be prefixed with the role name.

Signed-off-by: Matej Focko <mfocko@redhat.com>
---
 .../generate_secrets/tasks/create-directories.yml  |  2 +-
 .../roles/generate_secrets/tasks/generate-cert.yml | 14 +++++++-------
 .../generate_secrets/tasks/generate-configs.yml    |  2 +-
 .../roles/generate_secrets/tasks/generate-ssh.yml  |  2 +-
 .../roles/generate_secrets/tasks/touch-files.yml   |  2 +-
 playbooks/roles/generate_secrets/vars/main.yml     |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/playbooks/roles/generate_secrets/tasks/create-directories.yml b/playbooks/roles/generate_secrets/tasks/create-directories.yml
index 24106a8a..955559d4 100644
--- a/playbooks/roles/generate_secrets/tasks/create-directories.yml
+++ b/playbooks/roles/generate_secrets/tasks/create-directories.yml
@@ -4,6 +4,6 @@
 ---
 - name: Create secrets directory hierarchy
   ansible.builtin.file:
-    path: "{{ path_to_secrets }}"
+    path: "{{ generate_secrets_path }}"
     state: directory
     mode: 0755
diff --git a/playbooks/roles/generate_secrets/tasks/generate-cert.yml b/playbooks/roles/generate_secrets/tasks/generate-cert.yml
index 3359b16e..640362cc 100644
--- a/playbooks/roles/generate_secrets/tasks/generate-cert.yml
+++ b/playbooks/roles/generate_secrets/tasks/generate-cert.yml
@@ -10,7 +10,7 @@
 
 - name: Generate OpenSSL private keys
   openssl_privatekey:
-    path: "{{ path_to_secrets }}/{{ item }}"
+    path: "{{ generate_secrets_path }}/{{ item }}"
   loop:
     - private-key.pem
     - privkey.pem
@@ -19,24 +19,24 @@
 
 - name: Generate OpenSSL CSR
   openssl_csr:
-    path: "{{ path_to_secrets }}/{{ item.csr }}"
-    privatekey_path: "{{ path_to_secrets }}/{{ item.key }}"
+    path: "{{ generate_secrets_path }}/{{ item.csr }}"
+    privatekey_path: "{{ generate_secrets_path }}/{{ item.key }}"
     common_name: localhost
   loop:
     - { key: privkey.pem, csr: fullchain.csr }
 
 - name: Generate Self Signed OpenSSL certificate
   openssl_certificate:
-    path: "{{ path_to_secrets }}/{{ item.cert }}"
-    privatekey_path: "{{ path_to_secrets }}/{{ item.key }}"
-    csr_path: "{{ path_to_secrets }}/{{ item.csr }}"
+    path: "{{ generate_secrets_path }}/{{ item.cert }}"
+    privatekey_path: "{{ generate_secrets_path }}/{{ item.key }}"
+    csr_path: "{{ generate_secrets_path }}/{{ item.csr }}"
     provider: selfsigned
   loop:
     - { cert: fullchain.pem, key: privkey.pem, csr: fullchain.csr }
 
 - name: Remove CSR
   ansible.builtin.file:
-    path: "{{ path_to_secrets }}/{{ item }}"
+    path: "{{ generate_secrets_path }}/{{ item }}"
     state: absent
   loop:
     - fullchain.csr
diff --git a/playbooks/roles/generate_secrets/tasks/generate-configs.yml b/playbooks/roles/generate_secrets/tasks/generate-configs.yml
index 2aa0beff..e0fdabe1 100644
--- a/playbooks/roles/generate_secrets/tasks/generate-configs.yml
+++ b/playbooks/roles/generate_secrets/tasks/generate-configs.yml
@@ -5,7 +5,7 @@
 - name: Generate config files
   ansible.builtin.copy:
     src: "{{ item }}"
-    dest: "{{ path_to_secrets }}/{{ item }}"
+    dest: "{{ generate_secrets_path }}/{{ item }}"
     mode: 0644
   loop:
     - packit-service.yaml.j2
diff --git a/playbooks/roles/generate_secrets/tasks/generate-ssh.yml b/playbooks/roles/generate_secrets/tasks/generate-ssh.yml
index aa637724..3f5af5a9 100644
--- a/playbooks/roles/generate_secrets/tasks/generate-ssh.yml
+++ b/playbooks/roles/generate_secrets/tasks/generate-ssh.yml
@@ -4,5 +4,5 @@
 ---
 - name: Generate an OpenSSH keypair with the default values (4096 bits, rsa)
   openssh_keypair:
-    path: "{{ path_to_secrets }}/id_ed25519"
+    path: "{{ generate_secrets_path }}/id_ed25519"
     type: "ed25519"
diff --git a/playbooks/roles/generate_secrets/tasks/touch-files.yml b/playbooks/roles/generate_secrets/tasks/touch-files.yml
index 6043b591..0b58ce3e 100644
--- a/playbooks/roles/generate_secrets/tasks/touch-files.yml
+++ b/playbooks/roles/generate_secrets/tasks/touch-files.yml
@@ -4,7 +4,7 @@
 ---
 - name: Create empty files
   ansible.builtin.file:
-    path: "{{ path_to_secrets }}/{{ item }}"
+    path: "{{ generate_secrets_path }}/{{ item }}"
     state: touch
     mode: 0644
   loop:
diff --git a/playbooks/roles/generate_secrets/vars/main.yml b/playbooks/roles/generate_secrets/vars/main.yml
index 2523eb13..b6fd57d3 100644
--- a/playbooks/roles/generate_secrets/vars/main.yml
+++ b/playbooks/roles/generate_secrets/vars/main.yml
@@ -1 +1 @@
-path_to_secrets: "{{ generate_secrets_project_dir }}/secrets/packit/dev"
+generate_secrets_path: "{{ generate_secrets_project_dir }}/secrets/packit/dev"