From 75d19c5991e081cca656f010fef7cbe902d96685 Mon Sep 17 00:00:00 2001
From: Solmaz <smaabi@student.unimelb.edu.au>
Date: Wed, 24 May 2023 11:31:14 +1000
Subject: [PATCH] docker

---
 Deployment/playbooks/hosts.ini                  |  1 +
 .../roles/Couchdb_container/tasks/main.yaml     |  8 --------
 .../playbooks/roles/frontend/tasks/main.yaml    |  8 ++++++++
 Deployment/playbooks/setup.yaml                 | 17 +++--------------
 Deployment/playbooks/vars/vars.yaml             |  6 ++++++
 5 files changed, 18 insertions(+), 22 deletions(-)
 create mode 100644 Deployment/playbooks/roles/frontend/tasks/main.yaml
 create mode 100644 Deployment/playbooks/vars/vars.yaml

diff --git a/Deployment/playbooks/hosts.ini b/Deployment/playbooks/hosts.ini
index 7b17048..954aada 100644
--- a/Deployment/playbooks/hosts.ini
+++ b/Deployment/playbooks/hosts.ini
@@ -14,6 +14,7 @@ ansible_ssh_private_key_file=~/.ssh/intance_key
 ansible_user=ubuntu
 
 [frontend-instance]
+
 [frontend-instance:vars]
 ansible_ssh_common_args='-o StrictHostKeyChecking=no'
 ansible_ssh_private_key_file=~/.ssh/intance_key
diff --git a/Deployment/playbooks/roles/Couchdb_container/tasks/main.yaml b/Deployment/playbooks/roles/Couchdb_container/tasks/main.yaml
index 3503a2e..121f8f4 100644
--- a/Deployment/playbooks/roles/Couchdb_container/tasks/main.yaml
+++ b/Deployment/playbooks/roles/Couchdb_container/tasks/main.yaml
@@ -20,11 +20,3 @@
           - "5984:5984"
         restart_policy: always
 
-- name: Set up frontend application
-  hosts: frontend-instance
-  become: true
-  tasks:
-    - name: Install Docker
-      apt:
-        name: docker.io
-        state: present
\ No newline at end of file
diff --git a/Deployment/playbooks/roles/frontend/tasks/main.yaml b/Deployment/playbooks/roles/frontend/tasks/main.yaml
new file mode 100644
index 0000000..7ffd22e
--- /dev/null
+++ b/Deployment/playbooks/roles/frontend/tasks/main.yaml
@@ -0,0 +1,8 @@
+- name: Set up frontend application
+  hosts: frontend-instance
+  become: true
+  tasks:
+    - name: Install Docker
+      apt:
+        name: docker.io
+        state: present
\ No newline at end of file
diff --git a/Deployment/playbooks/setup.yaml b/Deployment/playbooks/setup.yaml
index 88d4c68..04a680f 100644
--- a/Deployment/playbooks/setup.yaml
+++ b/Deployment/playbooks/setup.yaml
@@ -11,30 +11,19 @@
 
 - hosts: master-instance
   vars_files:
-    - variable/couchdb_var.yaml
+    - vars/vars.yaml
   gather_facts: true
 
-  roles:
-    - role: common
-    - role: couch-volumes
-    - role: docker
-    - role: git-clone
-    - role: twiter-api-key
-    - role: docker-compose
 
 - hosts: slave-instances
   vars_files:
-    - variable/couchdb_var.yaml
+    - vars/
   gather_facts: true
 
   roles:
-    - role: couch-cluster
+
 
 - hosts: frontend-instance
   gather_facts: true
 
   roles:
-    - role: common
-    - role: docker
-    - role: git-clone
-    - role: web-app-docker-compose
\ No newline at end of file
diff --git a/Deployment/playbooks/vars/vars.yaml b/Deployment/playbooks/vars/vars.yaml
new file mode 100644
index 0000000..5fac9f2
--- /dev/null
+++ b/Deployment/playbooks/vars/vars.yaml
@@ -0,0 +1,6 @@
+volumes:
+  - device: /dev/vdb
+    mountpoint:
+
+db_username: admin
+db_password: admin
\ No newline at end of file
-- 
GitLab