From e5a47b8e0d38687d950ed98e7d11a4379702203b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 28 Nov 2024 18:16:11 +0100
Subject: [PATCH] Prefix openshift/sysadmin-openshift
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 playbooks/manual/ocp4-sysadmin-openshift.yml           |  2 +-
 roles/openshift/sysadmin-openshift/defaults/main.yaml  |  6 +++---
 .../openshift/sysadmin-openshift/tasks/resources.yaml  | 10 +++++-----
 .../openshift/sysadmin-openshift/templates/group.yaml  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/playbooks/manual/ocp4-sysadmin-openshift.yml b/playbooks/manual/ocp4-sysadmin-openshift.yml
index 7d3170de0f..af83788b65 100644
--- a/playbooks/manual/ocp4-sysadmin-openshift.yml
+++ b/playbooks/manual/ocp4-sysadmin-openshift.yml
@@ -4,7 +4,7 @@
 
   roles:
   - role: openshift/sysadmin-openshift
-    appowners:
+    sysadmin_openshift_appowners:
     - darknao
     - dkirwan
     - jrichardson
diff --git a/roles/openshift/sysadmin-openshift/defaults/main.yaml b/roles/openshift/sysadmin-openshift/defaults/main.yaml
index 31a5d42843..1677568433 100644
--- a/roles/openshift/sysadmin-openshift/defaults/main.yaml
+++ b/roles/openshift/sysadmin-openshift/defaults/main.yaml
@@ -1,6 +1,6 @@
 ---
-appowners: []
-project_name: sysadmin-openshift
-project_templates:
+sysadmin_openshift_appowners: []
+sysadmin_openshift_project_name: sysadmin-openshift
+sysadmin_openshift_project_templates:
   - group.yaml
   - rolebinding.yaml
diff --git a/roles/openshift/sysadmin-openshift/tasks/resources.yaml b/roles/openshift/sysadmin-openshift/tasks/resources.yaml
index f7a9fc5227..fa33c86903 100644
--- a/roles/openshift/sysadmin-openshift/tasks/resources.yaml
+++ b/roles/openshift/sysadmin-openshift/tasks/resources.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Create the directories to hold the templates
   file:
-    path: "/root/ocp4/openshift-apps/{{project_name}}"
+    path: "/root/ocp4/openshift-apps/{{sysadmin_openshift_project_name}}"
     state: directory
     owner: root
     group: root
@@ -14,15 +14,15 @@
 - name: create the templates
   template:
     src: "{{ item }}"
-    dest: "/root/ocp4/openshift-apps/{{project_name}}/{{ item }}"
+    dest: "/root/ocp4/openshift-apps/{{sysadmin_openshift_project_name}}/{{ item }}"
     mode: "0770"
-  with_items: "{{ project_templates }}"
+  with_items: "{{ sysadmin_openshift_project_templates }}"
   tags:
     - create-resources
 
 # apply created openshift resources
 - name: oc apply resources
-  command: "/root/bin/oc apply -f /root/ocp4/openshift-apps/{{project_name}}/{{ item }}"
-  with_items: "{{ project_templates }}"
+  command: "/root/bin/oc apply -f /root/ocp4/openshift-apps/{{sysadmin_openshift_project_name}}/{{ item }}"
+  with_items: "{{ sysadmin_openshift_project_templates }}"
   tags:
     - create-resources
diff --git a/roles/openshift/sysadmin-openshift/templates/group.yaml b/roles/openshift/sysadmin-openshift/templates/group.yaml
index be4523c199..1997f0b364 100644
--- a/roles/openshift/sysadmin-openshift/templates/group.yaml
+++ b/roles/openshift/sysadmin-openshift/templates/group.yaml
@@ -4,6 +4,6 @@ apiVersion: user.openshift.io/v1
 metadata:
   name: "sysadmin-openshift"
 users:
-{% for item in appowners %}
+{% for item in sysadmin_openshift_appowners %}
 - "{{ item }}"
 {% endfor %}