From bb049d181b40d591e692c8c1adfbe8cdeab6c1c4 Mon Sep 17 00:00:00 2001
From: David Kirwan <dkirwan@redhat.com>
Date: Tue, 9 Nov 2021 11:53:35 +0000
Subject: [PATCH] fcos-pipeline-migration: ensure templates placed in directory
 unique to the app.

Signed-off-by: David Kirwan <dkirwan@redhat.com>
---
 roles/openshift-apps/fcos-pipeline/tasks/main.yaml      | 6 +++---
 roles/openshift/sysadmin-openshift/defaults/main.yaml   | 1 +
 roles/openshift/sysadmin-openshift/tasks/resources.yaml | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/roles/openshift-apps/fcos-pipeline/tasks/main.yaml b/roles/openshift-apps/fcos-pipeline/tasks/main.yaml
index 8052086f9a..9555a260b6 100644
--- a/roles/openshift-apps/fcos-pipeline/tasks/main.yaml
+++ b/roles/openshift-apps/fcos-pipeline/tasks/main.yaml
@@ -1,6 +1,6 @@
 - name: Create the directories to hold the templates
   file:
-    path: "/root/ocp4/openshift-apps/"
+    path: "/root/ocp4/openshift-apps/{{project_name}}"
     state: directory
     owner: root
     group: root
@@ -11,13 +11,13 @@
 - name: create the templates
   template:
     src: "{{ item }}"
-    dest: "/root/ocp4/openshift-apps/{{ item }}"
+    dest: "/root/ocp4/openshift-apps/{{project_name}}/{{ item }}"
     mode: 0770
   with_items: "{{ project_templates }}"
 
 # apply created openshift resources
 - name: oc apply resources
-  command: "/root/bin/oc apply -f /root/ocp4/openshift-apps/{{ item }}"
+  command: "/root/bin/oc apply -f /root/ocp4/openshift-apps/{{project_name}}/{{ item }}"
   with_items: "{{ project_templates }}"
 
 # create the service account
diff --git a/roles/openshift/sysadmin-openshift/defaults/main.yaml b/roles/openshift/sysadmin-openshift/defaults/main.yaml
index d9cc9f6634..815afb21cd 100644
--- a/roles/openshift/sysadmin-openshift/defaults/main.yaml
+++ b/roles/openshift/sysadmin-openshift/defaults/main.yaml
@@ -1,4 +1,5 @@
 appowners: []
+project_name: 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 7613993e93..8d990d8bdc 100644
--- a/roles/openshift/sysadmin-openshift/tasks/resources.yaml
+++ b/roles/openshift/sysadmin-openshift/tasks/resources.yaml
@@ -1,6 +1,6 @@
 - name: Create the directories to hold the templates
   file:
-    path: "/root/ocp4/openshift-apps/"
+    path: "/root/ocp4/openshift-apps/{{project_name}}"
     state: directory
     owner: root
     group: root
@@ -13,7 +13,7 @@
 - name: create the templates
   template:
     src: "{{ item }}"
-    dest: "/root/ocp4/openshift-apps/{{ item }}"
+    dest: "/root/ocp4/openshift-apps/{{project_name}}/{{ item }}"
     mode: 0770
   with_items: "{{ project_templates }}"
   tags:
@@ -21,7 +21,7 @@
 
 # apply created openshift resources
 - name: oc apply resources
-  command: "/root/bin/oc apply -f /root/ocp4/openshift-apps/{{ item }}"
+  command: "/root/bin/oc apply -f /root/ocp4/openshift-apps/{{project_name}}/{{ item }}"
   with_items: "{{ project_templates }}"
   tags:
     - create-resources