Merge branch 'dev'

Author: akhil27051999

ansible/inventory.ini

@@ -1,5 +1,5 @@
 [new_vms]
-dev-vm ansible_host=192.168.1.150 ansible_user=ubuntu ansible_ssh_private_key_file=~/.ssh/id_rsa
+dev-vm ansible_host=44.197.15.118 ansible_user=ubuntu ansible_ssh_private_key_file=~/Flask-REST-API/vagrant/api-server.pem
 
 [new_vms:vars]
 ansible_python_interpreter=/usr/bin/python3

ansible/playbook.yaml

@@ -8,22 +8,29 @@
 
   tasks:
     - name: Include system setup tasks
-      include_tasks: tasks/system_setup.yml
+      include_tasks: tasks/system_setup.yaml
+      tags: system_setup
 
     - name: Include basic tools tasks
-      include_tasks: tasks/basic_tools.yml
+      include_tasks: tasks/basic_tools.yaml
+      tags: basic_tools
 
     - name: Include Docker tasks
-      include_tasks: tasks/docker.yml
+      include_tasks: tasks/docker.yaml
+      tags: docker
 
     - name: Include Kubernetes tools tasks
-      include_tasks: tasks/kubernetes.yml
+      include_tasks: tasks/kubernetes.yaml
+      tags: kubernetes
 
     - name: Include Terraform tasks
-      include_tasks: tasks/terraform.yml
+      include_tasks: tasks/terraform.yaml
+      tags: terraform
 
     - name: Include Ansible tasks
-      include_tasks: tasks/ansible.yml
+      include_tasks: tasks/ansible.yaml
+      tags: ansible
 
     - name: Include cleanup tasks
-      include_tasks: tasks/cleanup.yml
+      include_tasks: tasks/cleanup.yaml
+      tags: cleanup

ansible/tasks/ansible.yaml

@@ -1,31 +1,20 @@
 ---
-- name: Install Ansible via pip
+- name: Install Ansible via pip with break-system-packages
   pip:
     name: 
-      - ansible=={{ ansible_version }}
-      - ansible-lint
-      - yamllint
+      - ansible-core
     executable: pip3
-
-- name: Install Ansible community general collection
-  ansible.builtin.command:
-    cmd: ansible-galaxy collection install community.general
+    extra_args: --break-system-packages
 
 - name: Create ansible directory structure
   file:
     path: "{{ item }}"
     state: directory
     mode: '0755'
+    owner: "{{ dev_user }}"
+    group: "{{ dev_user }}"
   loop:
     - "/home/{{ dev_user }}/ansible"
     - "/home/{{ dev_user }}/ansible/inventories"
     - "/home/{{ dev_user }}/ansible/roles"
-    - "/home/{{ dev_user }}/ansible/playbooks"
-
-- name: Create ansible.cfg template
-  template:
-    src: ../templates/ansible.cfg.j2
-    dest: "/home/{{ dev_user }}/ansible/ansible.cfg"
-    owner: "{{ dev_user }}"
-    group: "{{ dev_user }}"
-    mode: '0644'
+    - "/home/{{ dev_user }}/ansible/playbooks"

ansible/tasks/basic_tools.yaml

@@ -1,3 +1,4 @@
+---
 - name: Install development tools
   apt:
     name:
@@ -11,13 +12,8 @@
       - python3
       - python3-pip
       - python3-venv
+      - python3-full
+      - pipx
       - postgresql-client
       - mysql-client
-    state: present
-
-- name: Install additional Python tools
-  pip:
-    name:
-      - awscli
-      - boto3
-    executable: pip3
+    state: present

ansible/tasks/docker.yaml

@@ -1,26 +1,27 @@
 ---
-- name: Add Docker GPG key
+- name: Add Docker GPG apt Key
   apt_key:
     url: https://download.docker.com/linux/ubuntu/gpg
     state: present
 
-- name: Add Docker repository
+- name: Add Docker Repository for Ubuntu 20.04 (Focal)
   apt_repository:
-    repo: "deb [arch={{ ansible_architecture }}] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
+    repo: deb https://download.docker.com/linux/ubuntu focal stable
     state: present
     filename: docker
 
-- name: Install Docker packages
+- name: Update apt and install docker-ce
   apt:
-    name:
-      - docker-ce
-      - docker-ce-cli
-      - containerd.io
-      - docker-buildx-plugin
-      - docker-compose-plugin
-    state: present
+    name: docker-ce
+    state: latest
     update_cache: yes
 
+- name: Install Docker Module for Python
+  pip:
+    name: docker
+    executable: pip3
+    extra_args: --break-system-packages
+
 - name: Enable and start Docker service
   systemd:
     name: docker
@@ -30,5 +31,11 @@
 - name: Add user to docker group
   user:
     name: "{{ dev_user }}"
-    groups: "{{ docker_group }}"
-    append: yes
+    groups: docker
+    append: yes
+
+- name: Install Docker Compose
+  get_url:
+    url: https://github.com/docker/compose/releases/latest/download/docker-compose-linux-x86_64
+    dest: /usr/local/bin/docker-compose
+    mode: '0755'