Merge pull request #85 from GomathiselviS/webapp_role

Add role deploy_flask_app

Author: GomathiselviS

README.md

@@ -28,6 +28,8 @@ Name | Description
 [cloud.aws_ops.manage_vpc_peering](https://github.com/ansible-collections/cloud.aws_ops/blob/main/roles/manage_vpc_peering/README.md)|A role to create, delete and accept existing VPC peering connections.
 [cloud.aws_ops.moving_objects_between_buckets](https://github.com/ansible-collections/cloud.aws_ops/blob/main/roles/moving_objects_between_buckets/README.md)|A role to move objects from one bucket to another bucket.
 [cloud.aws_ops.awsconfig_apigateway_with_lambda_integration](https://github.com/ansible-collections/cloud.aws_ops/blob/main/roles/awsconfig_apigateway_with_lambda_integration/README.md)|A role to create/delete an API gateway with lambda function integration.
+[cloud.aws_ops.manage_transit_gateway](https://github.com/ansible-collections/cloud.aws_ops/blob/main/roles/manage_transit_gateway/README.md)|A role to create/delete transit_gateway with vpc and vpn attachments.
+[cloud.aws_ops.deploy_flask_app](https://github.com/ansible-collections/cloud.aws_ops/blob/main/roles/deploy_flask_app/README.md)|A role to deploy a flask web application on AWS.
 
 ### Playbooks
 Name | Description

changelogs/fragments/add_deploy_flask_app_role.yaml

@@ -0,0 +1,21 @@
+---
+breaking_changes:
+- "Rename the vars in webapp playbook with role name prefix (https://github.com/redhat-cop/cloud.aws_ops/pull/85).
+  'sshkey_pair_name' changed to 'deploy_flask_app_sshkey_pair_name'
+  'bastion_host_name' changed to 'deploy_flask_app_bastion_host_name'
+  'bastion_host_username' changed to 'deploy_flask_app_bastion_host_username'
+  'bastion_host_required_packages' changed to 'deploy_flask_app_bastion_host_required_packages'
+  'app_listening_port' changed to 'deploy_flask_app_listening_port'
+  'rds_master_user' changed to 'deploy_flask_app_rds_master_username'
+  'rds_master_password' changed to 'deploy_flask_app_rds_master_password'
+  'app_git_repository' changed to 'deploy_flask_app_git_repository'
+  'number_of_workers' changed to 'deploy_flask_app_number_of_workers'
+  'workers_instance_type' changed to 'deploy_flask_app_workers_instance_type'
+  'local_registry_user' changed to 'deploy_flask_app_local_registry_user'
+  'local_registry_pwd' changed to 'deploy_flask_app_local_registry_pwd'
+  'local_registry_port' changed to 'deploy_flask_app_local_registry_port'
+  'app_config' changed to 'deploy_flask_app_config'
+  'app_force_init' changed to 'deploy_flask_app_force_init'
+  "
+minor_changes:
+- "Convert deploy_flask_app playbook to role (https://github.com/redhat-cop/cloud.aws_ops/pull/85)."

playbooks/webapp/README.md

@@ -97,11 +97,11 @@ To delete the webapp:
 ### EC2 instance
 
 * **image_filter** (str): Name of AWS AMI to use. Default: `Fedora-Cloud-Base-35-*`
-* **sshkey_pair_name** (str): Name for the EC2 key pair. Default: `"{{ resource_prefix }}-key"`
-* **bastion_host_name** (str): Name for the EC2 instance. Default: `"{{ resource_prefix }}-bastion"`
+* **deploy_flask_app_sshkey_pair_name** (str): Name for the EC2 key pair. Default: `"{{ resource_prefix }}-key"`
+* **deploy_flask_app_bastion_host_name** (str): Name for the EC2 instance. Default: `"{{ resource_prefix }}-bastion"`
 * **bastion_host_type** (str): Instance type for the EC2 instance. Default: `t2.xlarge`
-* **bastion_host_username** (str): Username for the bastion host SSH user. Default: `fedora`
-* **bastion_host_required_packages** (list, elements str): Packages to be installed on the bastion host. Default:
+* **deploy_flask_app_bastion_host_username** (str): Username for the bastion host SSH user. Default: `fedora`
+* **deploy_flask_app_bastion_host_required_packages** (list, elements str): Packages to be installed on the bastion host. Default:
   ```yaml
   - python3
   - python-virtualenv
@@ -125,7 +125,7 @@ To delete the webapp:
 * **rds_subnet_group_name** (str): Subnet group name for the RDS instance. Default: `"{{ resource_prefix }}-rds-sg"`
 * **rds_secgroup_name** (str): Security group name for the RDS instance. Default: `"{{ resource_prefix }}-rds-sec"`
 * **public_secgroup_name** (str): Security group name for the bastion host. Default: `"{{ resource_prefix }}-sg"`
-* **app_listening_port** (int): Connection listening port for the app on the bastion host. Default: `5000`
+* **deploy_flask_app_listening_port** (int): Connection listening port for the app on the bastion host. Default: `5000`
 * **rds_listening_port** (int): Connection listening port for the RDS instance. Default: `5432`
 
 ### RDS instance
@@ -137,25 +137,25 @@ To delete the webapp:
 * **rds_instance_name** (str): Name for the database. Default: `mysampledb123`
 * **rds_engine** (str): Engine to use for the database. Default: `postgres`
 * **rds_engine_version** (str): Version number of the database engine to use. Default: `"14.8"`
-* **rds_master_user** (str): Name of the master user for the database instance. Default: `ansible`
-* **rds_master_password** (str): Password for the master database user. Default: `L#5cH2mgy_`
+* **deploy_flask_app_rds_master_username** (str): Name of the master user for the database instance. Default: `ansible`
+* **deploy_flask_app_rds_master_password** (str): Password for the master database user. Default: `L#5cH2mgy_`
 
 ### Webapp
 
-* **app_git_repository** (str): Git repository for the webapp. Default: `https://github.com/abikouo/webapp_pyflask_demo.git`
-* **number_of_workers** (int): Number of worker instances to create. Default: `2`
-* **workers_instance_type** (str): EC2 instance type for workers. Default: `t2.large`
-* **local_registry_user** (str): Username for local Podman registry. Default: `ansible`
-* **local_registry_pwd** (str): Password for local Podman registry. Default: `testing123`
-* **local_registry_port** (int): Port for the local Podman registery. Default: `"{{ app_listening_port }}"`
-* **app_config** (dict, elements dict): Configuration values for the webapp, passed as corresponding env variables FLASK_APP, FLASK_ENV, ADMIN_USER, and ADMIN_PASSWORD when the app is deployed. Default:
+* **deploy_flask_app_git_repository** (str): Git repository for the webapp. Default: `https://github.com/abikouo/webapp_pyflask_demo.git`
+* **deploy_flask_app_number_of_workers** (int): Number of worker instances to create. Default: `2`
+* **deploy_flask_app_workers_instance_type** (str): EC2 instance type for workers. Default: `t2.xlarge`
+* **deploy_flask_app_local_registry_user** (str): Username for local Podman registry. Default: `ansible`
+* **deploy_flask_app_local_registry_pwd** (str): Password for local Podman registry. Default: `testing123`
+* **deploy_flask_app_local_registry_port** (int): Port for the local Podman registery. Default: `"{{ app_listening_port }}"`
+* **deploy_flask_app_config** (dict, elements dict): Configuration values for the webapp, passed as corresponding env variables FLASK_APP, FLASK_ENV, ADMIN_USER, and ADMIN_PASSWORD when the app is deployed. Default:
   ```yaml
   app_dir: /app/pyapp
   env: development
   admin_user: admin
   admin_password: admin
   ```
-* **app_force_init** (bool): Whether to drop existing tables and create new ones when deploying the webapp database. Default: `false`
+* **deploy_flask_app_force_init** (bool): Whether to drop existing tables and create new ones when deploying the webapp database. Default: `false`
 
 ## Example Usage
 

playbooks/webapp/migrate_webapp.yaml

@@ -6,12 +6,6 @@
   vars_files:
     - vars/main.yaml
 
-  module_defaults:
-    group/aws:
-      aws_access_key: "{{ aws_access_key | default(omit) }}"
-      aws_secret_key: "{{ aws_secret_key | default(omit) }}"
-      security_token: "{{ security_token | default(omit) }}"
-
   tasks:
     - name: Fail when 'resource_prefix' is not defined
       ansible.builtin.fail:
@@ -60,6 +54,17 @@
         rds_snapshot_arn: "{{ result.db_snapshot_arn }}"
         region: "{{ dest_region }}"
 
+    - name: Deploy app
+      when: operation == "create"
+      ansible.builtin.import_role:
+        name: cloud.aws_ops.deploy_flask_app
+      vars:
+        deploy_flask_app_private_subnet_id: "{{ private_subnet.subnet.id }}"
+        deploy_flask_app_vpc_id: "{{ vpc.vpc.id }}"
+        deploy_flask_app_vm_info: "{{ vm_result }}"
+        deploy_flask_app_rds_info: "{{ rds_result }}"
+        deploy_flask_app_region: "{{ dest_region }}"
+
     - name: Delete RDS snapshots from different regions
       amazon.aws.rds_instance_snapshot:
         region: "{{ item }}"
@@ -73,16 +78,3 @@
     - name: Delete instance from source region
       ansible.builtin.import_tasks: tasks/delete.yaml
       when: delete_source | default(false) | bool
-
-- name: Deploy resource from Bastion
-  hosts: bastion
-  gather_facts: false
-
-  vars_files:
-    - vars/main.yaml
-
-  tasks:
-    - name: Deploy app
-      ansible.builtin.import_tasks: tasks/deploy_app.yaml
-      vars:
-        region: "{{ dest_region }}"

playbooks/webapp/tasks/create.yaml

@@ -10,7 +10,6 @@
       aws_secret_key: "{{ aws_secret_key | default(omit) }}"
       security_token: "{{ security_token | default(omit) }}"
       region: "{{ region }}"
-
   block:
     - name: Get image ID to create an instance
       amazon.aws.ec2_ami_info:
@@ -23,8 +22,6 @@
 
     - name: List availability zones from aws region
       amazon.aws.aws_az_info:
-        filters:
-          region-name: "{{ region }}"
       register: zones
 
     - name: Set region_av_zones' variable
@@ -127,8 +124,8 @@
             to_port: 22
           - cidr_ip: 0.0.0.0/0
             proto: tcp
-            from_port: "{{ app_listening_port }}"
-            to_port: "{{ app_listening_port }}"
+            from_port: "{{ deploy_flask_app_listening_port }}"
+            to_port: "{{ deploy_flask_app_listening_port }}"
         rules_egress:
           - cidr_ip: 0.0.0.0/0
             proto: -1
@@ -153,10 +150,10 @@
     - name: Get RDS instance info
       amazon.aws.rds_instance_info:
         db_instance_identifier: "{{ rds_identifier }}"
-      register: rds_info
+      register: rds_result
 
     - name: Create RDS instance
-      when: rds_info.instances | length == 0
+      when: rds_result.instances | length == 0
       block:
         - name: Create RDS instance (PostGreSQL Database)
           amazon.aws.rds_instance:
@@ -169,8 +166,8 @@
             db_name: "{{ rds_instance_name }}"
             engine: "{{ rds_engine }}"
             engine_version: "{{ rds_engine_version }}"
-            master_user_password: "{{ rds_master_password }}"
-            master_username: "{{ rds_master_user }}"
+            master_user_password: "{{ deploy_flask_app_rds_master_password }}"
+            master_username: "{{ deploy_flask_app_rds_master_username }}"
             monitoring_interval: 0
             storage_type: standard
             skip_final_snapshot: true
@@ -189,8 +186,8 @@
             db_instance_identifier: "{{ rds_identifier }}"
             engine: "{{ rds_engine }}"
             engine_version: "{{ rds_engine_version }}"
-            master_user_password: "{{ rds_master_password }}"
-            master_username: "{{ rds_master_user }}"
+            master_user_password: "{{ deploy_flask_app_rds_master_password }}"
+            master_username: "{{ deploy_flask_app_rds_master_username }}"
             monitoring_interval: 0
             storage_type: standard
             skip_final_snapshot: true
@@ -204,15 +201,15 @@
     - name: Get RDS instance info
       amazon.aws.rds_instance_info:
         db_instance_identifier: "{{ rds_identifier }}"
-      register: rds_info
+      register: rds_result
 
     - name: Set 'sshkey_file' variable
       ansible.builtin.set_fact:
-        sshkey_file: ~/private-key-{{ sshkey_pair_name }}-{{ region | default(aws_region) }}
+        sshkey_file: ~/private-key-{{ deploy_flask_app_sshkey_pair_name }}-{{ region | default(aws_region) }}
 
     - name: Create key pair to connect to the VM
       amazon.aws.ec2_key:
-        name: "{{ sshkey_pair_name }}"
+        name: "{{ deploy_flask_app_sshkey_pair_name }}"
       register: rsa_key
 
     - name: Save private key into file
@@ -224,10 +221,10 @@
 
     - name: Create a virtual machine
       amazon.aws.ec2_instance:
-        name: "{{ bastion_host_name }}"
+        name: "{{ deploy_flask_app_bastion_host_name }}"
         instance_type: "{{ bastion_host_type }}"
         image_id: "{{ images.images.0.image_id }}"
-        key_name: "{{ sshkey_pair_name }}"
+        key_name: "{{ deploy_flask_app_sshkey_pair_name }}"
         subnet_id: "{{ subnet.subnet.id }}"
         network:
           assign_public_ip: true
@@ -237,24 +234,4 @@
           - "{{ secgroup.group_id }}"
         wait: true
         state: started
-      register: result
-
-    - name: Add host to inventory
-      ansible.builtin.add_host:
-        hostname: bastion
-        ansible_ssh_user: "{{ bastion_host_username }}"
-        ansible_host: "{{ result.instances.0.public_ip_address }}"
-        ansible_ssh_common_args: -o "UserKnownHostsFile=/dev/null" -o StrictHostKeyChecking=no -i {{ sshkey_file }}
-        ansible_host_name: "{{ result.instances.0.public_dns_name | split('.') | first }}"
-        host_config:
-          public_subnet_id: "{{ subnet.subnet.id }}"
-          private_subnet_id: "{{ private_subnet.subnet.id }}"
-          image_id: "{{ images.images.0.image_id }}"
-          group_id: "{{ secgroup.group_id }}"
-          private_ip: "{{ result.instances.0.private_ip_address }}"
-          vpc_id: "{{ vpc.vpc.id }}"
-          rds_info:
-            host: "{{ rds_info.instances.0.endpoint.address }}"
-            name: "{{ rds_instance_name }}"
-            master_user_password: "{{ rds_master_password }}"
-            master_username: "{{ rds_master_user }}"
+      register: vm_result

playbooks/webapp/tasks/delete.yaml

@@ -1,13 +1,11 @@
 ---
 - name: Delete resources playbook
-  module_defaults:
-    group/aws:
-      aws_access_key: "{{ aws_access_key | default(omit) }}"
-      aws_secret_key: "{{ aws_secret_key | default(omit) }}"
-      security_token: "{{ security_token | default(omit) }}"
-      region: "{{ region | default(aws_region) }}"
 
   block:
+    - name: Set 'region' variable
+      ansible.builtin.set_fact:
+        region: "{{ region | default(aws_region) }}"
+
     - name: Get vpc information
       amazon.aws.ec2_vpc_net_info:
         filters:
@@ -25,7 +23,7 @@
           amazon.aws.ec2_instance_info:
             filters:
               instance-type: "{{ bastion_host_type }}"
-              key-name: "{{ sshkey_pair_name }}"
+              key-name: "{{ deploy_flask_app_sshkey_pair_name }}"
               vpc-id: "{{ vpc_id }}"
           register: bastion
 
@@ -76,7 +74,7 @@
 
         - name: Delete key pair to connect to the bastion VM
           amazon.aws.ec2_key:
-            name: "{{ sshkey_pair_name }}"
+            name: "{{ deploy_flask_app_sshkey_pair_name }}"
             state: absent
 
         - name: Delete RDS subnet group