refactor postgres install & config

sassoftware · Nov 13, 2023 · 1c415dc · 1c415dc
1 parent e5ebbf5
commit 1c415dc
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/playbooks/kubernetes-install.yaml b/playbooks/kubernetes-install.yaml
@@ -74,23 +74,6 @@
   roles:
     - { role: kubernetes/node/labels_taints }
 
-# Alter PostgreSQL server and add PostgreSQL databases
-- hosts: postgres
-  name: Postgres Setup - Configuration
-  become: true
-  become_user: postgres
-  roles:
-    - { role: kubernetes/database/postgres/alter_server_settings }
-    - { role: kubernetes/database/postgres/create_databases }
-
-# Restart PostgreSQL server
-- hosts: postgres
-  name: Postgres Setup - Restart
-  become: true
-  become_user: root
-  roles:
-    - { role: kubernetes/database/postgres/restart_server }
-
 # Setup default storage class for cluster
 - hosts: localhost
   name: Default Storage Class Setup

diff --git a/playbooks/systems-install.yaml b/playbooks/systems-install.yaml
@@ -33,7 +33,24 @@
   become: true
   become_user: root
   roles:
-    - { role: systems/postgres }
+    - { role: systems/postgres/install }
+
+# Alter PostgreSQL server and add PostgreSQL databases
+- hosts: postgres
+  name: Postgres Setup - Configuration
+  become: true
+  become_user: postgres
+  roles:
+    - { role: systems/postgres/alter_server_settings }
+    - { role: systems/postgres/create_databases }
+
+# Restart PostgreSQL server
+- hosts: postgres
+  name: Postgres Setup - Restart
+  become: true
+  become_user: root
+  roles:
+    - { role: systems/postgres/restart_server }
 
 # Container Registry Server
 - hosts: cr

diff --git a/.../alter_server_settings/defaults/main.yaml → .../alter_server_settings/defaults/main.yaml b/.../alter_server_settings/defaults/main.yaml → .../alter_server_settings/defaults/main.yaml
diff --git a/...res/alter_server_settings/tasks/main.yaml → ...res/alter_server_settings/tasks/main.yaml b/...res/alter_server_settings/tasks/main.yaml → ...res/alter_server_settings/tasks/main.yaml
diff --git a/...postgres/create_databases/tasks/main.yaml → ...postgres/create_databases/tasks/main.yaml b/...postgres/create_databases/tasks/main.yaml → ...postgres/create_databases/tasks/main.yaml
diff --git a/roles/systems/postgres/defaults/main.yaml → ...stems/postgres/install/defaults/main.yaml b/roles/systems/postgres/defaults/main.yaml → ...stems/postgres/install/defaults/main.yaml
diff --git a/roles/systems/postgres/tasks/main.yaml → .../systems/postgres/install/tasks/main.yaml b/roles/systems/postgres/tasks/main.yaml → .../systems/postgres/install/tasks/main.yaml
diff --git a/...e/postgres/restart_server/tasks/main.yaml → ...s/postgres/restart_server/tasks/main.yaml b/...e/postgres/restart_server/tasks/main.yaml → ...s/postgres/restart_server/tasks/main.yaml