merge etherpad and ehterpad_nginx role

hpi-schul-cloud · Dec 10, 2024 · 3c87046 · 3c87046
1 parent 052706b
commit 3c87046
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 35 deletions.
diff --git a/...oles/dof_etherpad_nginx/defaults/main.yml → ansible/roles/dof_etherpad/defaults/main.yml b/...oles/dof_etherpad_nginx/defaults/main.yml → ansible/roles/dof_etherpad/defaults/main.yml
diff --git a/ansible/roles/dof_etherpad/tasks/main.yml b/ansible/roles/dof_etherpad/tasks/main.yml
@@ -41,4 +41,29 @@
       template: deployment.yml.j2
     tags:
       - deployment
-
+
+  - name: nginx service
+    kubernetes.core.k8s:
+      kubeconfig: ~/.kube/config
+      namespace: "{{ NAMESPACE }}"
+      template: nginx-svc.yml.j2
+    tags:
+      - service
+
+  - name: nginx configmap files
+    kubernetes.core.k8s:
+      kubeconfig: ~/.kube/config
+      namespace: "{{ NAMESPACE }}"
+      template: nginx-configmap-files.yml.j2
+      apply: yes
+    tags:
+      - configmap
+
+  - name: nginx deployment
+    kubernetes.core.k8s:
+      kubeconfig: ~/.kube/config
+      namespace: "{{ NAMESPACE }}"
+      template: nginx-deployment.yml.j2
+    tags:
+      - deployment
+
diff --git a/...ad_nginx/templates/configmap-files.yml.j2 → ...ad/templates/nginx-configmap-files.yml.j2 b/...ad_nginx/templates/configmap-files.yml.j2 → ...ad/templates/nginx-configmap-files.yml.j2
diff --git a/...therpad_nginx/templates/deployment.yml.j2 → ...therpad/templates/nginx-deployment.yml.j2 b/...therpad_nginx/templates/deployment.yml.j2 → ...therpad/templates/nginx-deployment.yml.j2
diff --git a/...s/dof_etherpad_nginx/templates/svc.yml.j2 → ...s/dof_etherpad/templates/nginx-svc.yml.j2 b/...s/dof_etherpad_nginx/templates/svc.yml.j2 → ...s/dof_etherpad/templates/nginx-svc.yml.j2
diff --git a/ansible/roles/dof_etherpad_nginx/meta/main.yml b/ansible/roles/dof_etherpad_nginx/meta/main.yml
diff --git a/ansible/roles/dof_etherpad_nginx/tasks/main.yml b/ansible/roles/dof_etherpad_nginx/tasks/main.yml