From 807189f6e8b6e3d1acf800f56ae95269bcb67a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Fri, 21 Jun 2024 14:53:35 +0000
Subject: [PATCH] Files ansible paths refactoring
---
.../files/{ => etc/ansible/facts.d}/helm_repos.fact | 0
.../playbooks/files/{ => etc/profile.d}/k8s-cheats.sh | 0
.../playbooks/files/{ => usr/local/bin}/xfs-quotas.sh | 0
cesnet-central/playbooks/k8s.yaml | 6 +++---
cesnet-mcc/playbooks/files/etc | 1 +
cesnet-mcc/playbooks/files/helm_repos.fact | 1 -
cesnet-mcc/playbooks/files/k8s-cheats.sh | 1 -
cesnet-mcc/playbooks/files/usr | 1 +
cesnet-mcc/playbooks/files/xfs-quotas.sh | 1 -
staging/playbooks/files/etc | 1 +
staging/playbooks/files/helm_repos.fact | 1 -
staging/playbooks/files/k8s-cheats.sh | 1 -
staging/playbooks/files/usr | 1 +
staging/playbooks/files/xfs-quotas.sh | 1 -
testing/playbooks/files/etc | 1 +
testing/playbooks/files/helm_repos.fact | 1 -
testing/playbooks/files/k8s-cheats.sh | 1 -
testing/playbooks/files/usr | 1 +
testing/playbooks/files/xfs-quotas.sh | 1 -
19 files changed, 9 insertions(+), 12 deletions(-)
rename cesnet-central/playbooks/files/{ => etc/ansible/facts.d}/helm_repos.fact (100%)
rename cesnet-central/playbooks/files/{ => etc/profile.d}/k8s-cheats.sh (100%)
rename cesnet-central/playbooks/files/{ => usr/local/bin}/xfs-quotas.sh (100%)
create mode 120000 cesnet-mcc/playbooks/files/etc
delete mode 120000 cesnet-mcc/playbooks/files/helm_repos.fact
delete mode 120000 cesnet-mcc/playbooks/files/k8s-cheats.sh
create mode 120000 cesnet-mcc/playbooks/files/usr
delete mode 120000 cesnet-mcc/playbooks/files/xfs-quotas.sh
create mode 120000 staging/playbooks/files/etc
delete mode 120000 staging/playbooks/files/helm_repos.fact
delete mode 120000 staging/playbooks/files/k8s-cheats.sh
create mode 120000 staging/playbooks/files/usr
delete mode 120000 staging/playbooks/files/xfs-quotas.sh
create mode 120000 testing/playbooks/files/etc
delete mode 120000 testing/playbooks/files/helm_repos.fact
delete mode 120000 testing/playbooks/files/k8s-cheats.sh
create mode 120000 testing/playbooks/files/usr
delete mode 120000 testing/playbooks/files/xfs-quotas.sh
diff --git a/cesnet-central/playbooks/files/helm_repos.fact b/cesnet-central/playbooks/files/etc/ansible/facts.d/helm_repos.fact
similarity index 100%
rename from cesnet-central/playbooks/files/helm_repos.fact
rename to cesnet-central/playbooks/files/etc/ansible/facts.d/helm_repos.fact
diff --git a/cesnet-central/playbooks/files/k8s-cheats.sh b/cesnet-central/playbooks/files/etc/profile.d/k8s-cheats.sh
similarity index 100%
rename from cesnet-central/playbooks/files/k8s-cheats.sh
rename to cesnet-central/playbooks/files/etc/profile.d/k8s-cheats.sh
diff --git a/cesnet-central/playbooks/files/xfs-quotas.sh b/cesnet-central/playbooks/files/usr/local/bin/xfs-quotas.sh
similarity index 100%
rename from cesnet-central/playbooks/files/xfs-quotas.sh
rename to cesnet-central/playbooks/files/usr/local/bin/xfs-quotas.sh
diff --git a/cesnet-central/playbooks/k8s.yaml b/cesnet-central/playbooks/k8s.yaml
index c5629a7..26daba2 100644
--- a/cesnet-central/playbooks/k8s.yaml
+++ b/cesnet-central/playbooks/k8s.yaml
@@ -120,7 +120,7 @@
- name: Quota script
copy:
dest: /usr/local/bin/xfs-quotas.sh
- src: files/xfs-quotas.sh
+ src: files/usr/local/bin/xfs-quotas.sh
mode: 0755
owner: root
group: root
@@ -165,7 +165,7 @@
- name: Site k8s cheat sheets
copy:
dest: /etc/profile.d/k8s-cheats.sh
- src: files/k8s-cheats.sh
+ src: files//etc/profile.d/k8s-cheats.sh
mode: preserve
- name: K8s network deployment
@@ -257,7 +257,7 @@
state: "directory"
- name: Create helm repos custom fact
copy:
- src: files/helm_repos.fact
+ src: files/etc/ansible/facts.d/helm_repos.fact
dest: /etc/ansible/facts.d/helm_repos.fact
mode: 0755
- name: Reload custom facts
diff --git a/cesnet-mcc/playbooks/files/etc b/cesnet-mcc/playbooks/files/etc
new file mode 120000
index 0000000..0246be9
--- /dev/null
+++ b/cesnet-mcc/playbooks/files/etc
@@ -0,0 +1 @@
+../../../cesnet-central/playbooks/files/etc
\ No newline at end of file
diff --git a/cesnet-mcc/playbooks/files/helm_repos.fact b/cesnet-mcc/playbooks/files/helm_repos.fact
deleted file mode 120000
index 94d2856..0000000
--- a/cesnet-mcc/playbooks/files/helm_repos.fact
+++ /dev/null
@@ -1 +0,0 @@
-../../../cesnet-central/playbooks/files/helm_repos.fact
\ No newline at end of file
diff --git a/cesnet-mcc/playbooks/files/k8s-cheats.sh b/cesnet-mcc/playbooks/files/k8s-cheats.sh
deleted file mode 120000
index d20f90f..0000000
--- a/cesnet-mcc/playbooks/files/k8s-cheats.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../cesnet-central/playbooks/files/k8s-cheats.sh
\ No newline at end of file
diff --git a/cesnet-mcc/playbooks/files/usr b/cesnet-mcc/playbooks/files/usr
new file mode 120000
index 0000000..47d6e90
--- /dev/null
+++ b/cesnet-mcc/playbooks/files/usr
@@ -0,0 +1 @@
+../../../cesnet-central/playbooks/files/usr
\ No newline at end of file
diff --git a/cesnet-mcc/playbooks/files/xfs-quotas.sh b/cesnet-mcc/playbooks/files/xfs-quotas.sh
deleted file mode 120000
index 5330cad..0000000
--- a/cesnet-mcc/playbooks/files/xfs-quotas.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../cesnet-central/playbooks/files/xfs-quotas.sh
\ No newline at end of file
diff --git a/staging/playbooks/files/etc b/staging/playbooks/files/etc
new file mode 120000
index 0000000..0246be9
--- /dev/null
+++ b/staging/playbooks/files/etc
@@ -0,0 +1 @@
+../../../cesnet-central/playbooks/files/etc
\ No newline at end of file
diff --git a/staging/playbooks/files/helm_repos.fact b/staging/playbooks/files/helm_repos.fact
deleted file mode 120000
index 94d2856..0000000
--- a/staging/playbooks/files/helm_repos.fact
+++ /dev/null
@@ -1 +0,0 @@
-../../../cesnet-central/playbooks/files/helm_repos.fact
\ No newline at end of file
diff --git a/staging/playbooks/files/k8s-cheats.sh b/staging/playbooks/files/k8s-cheats.sh
deleted file mode 120000
index d20f90f..0000000
--- a/staging/playbooks/files/k8s-cheats.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../cesnet-central/playbooks/files/k8s-cheats.sh
\ No newline at end of file
diff --git a/staging/playbooks/files/usr b/staging/playbooks/files/usr
new file mode 120000
index 0000000..47d6e90
--- /dev/null
+++ b/staging/playbooks/files/usr
@@ -0,0 +1 @@
+../../../cesnet-central/playbooks/files/usr
\ No newline at end of file
diff --git a/staging/playbooks/files/xfs-quotas.sh b/staging/playbooks/files/xfs-quotas.sh
deleted file mode 120000
index 5330cad..0000000
--- a/staging/playbooks/files/xfs-quotas.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../cesnet-central/playbooks/files/xfs-quotas.sh
\ No newline at end of file
diff --git a/testing/playbooks/files/etc b/testing/playbooks/files/etc
new file mode 120000
index 0000000..0246be9
--- /dev/null
+++ b/testing/playbooks/files/etc
@@ -0,0 +1 @@
+../../../cesnet-central/playbooks/files/etc
\ No newline at end of file
diff --git a/testing/playbooks/files/helm_repos.fact b/testing/playbooks/files/helm_repos.fact
deleted file mode 120000
index 94d2856..0000000
--- a/testing/playbooks/files/helm_repos.fact
+++ /dev/null
@@ -1 +0,0 @@
-../../../cesnet-central/playbooks/files/helm_repos.fact
\ No newline at end of file
diff --git a/testing/playbooks/files/k8s-cheats.sh b/testing/playbooks/files/k8s-cheats.sh
deleted file mode 120000
index d20f90f..0000000
--- a/testing/playbooks/files/k8s-cheats.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../cesnet-central/playbooks/files/k8s-cheats.sh
\ No newline at end of file
diff --git a/testing/playbooks/files/usr b/testing/playbooks/files/usr
new file mode 120000
index 0000000..47d6e90
--- /dev/null
+++ b/testing/playbooks/files/usr
@@ -0,0 +1 @@
+../../../cesnet-central/playbooks/files/usr
\ No newline at end of file
diff --git a/testing/playbooks/files/xfs-quotas.sh b/testing/playbooks/files/xfs-quotas.sh
deleted file mode 120000
index 5330cad..0000000
--- a/testing/playbooks/files/xfs-quotas.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../cesnet-central/playbooks/files/xfs-quotas.sh
\ No newline at end of file
--
GitLab