Extend create vm job template (ansible#97)

l3acon · Sep 18, 2023 · e570ed6 · e570ed6
1 parent 35258c8
commit e570ed6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/cloud/setup.yml b/cloud/setup.yml
@@ -249,6 +249,14 @@ controller_templates:
           variable: create_vm_aws_keypair_name
           required: true
           default: aws-test-key
+        - question_name: AWS Instance Type (defaults to blueprint value)
+          type: text
+          variable: create_vm_aws_instance_size
+          required: false
+        - question_name: AWS Image Filter (defaults to blueprint value)
+          type: text
+          variable: create_vm_aws_image_filter
+          required: false
 
   - name: Cloud / AWS / Delete VM
     job_type: run
@@ -612,4 +620,4 @@ controller_workflows:
       - identifier: Ticket - Restore Failed
         unified_job_template: 'SUBMIT FEEDBACK'
         extra_data:
-          feedback: Cloud / AWS / Patch EC2 Workflow | Failed to restore ec2 from snapshot
+          feedback: Cloud / AWS / Patch EC2 Workflow | Failed to restore ec2 from snapshot
diff --git a/collections/ansible_collections/demo/cloud/roles/aws/defaults/main.yml b/collections/ansible_collections/demo/cloud/roles/aws/defaults/main.yml
@@ -21,4 +21,4 @@ aws_env_tag: prod
 aws_purpose_tag: ansible_demo
 aws_ansiblegroup_tag: cloud
 aws_ec2_wait: true
-aws_snapshots: {}
+aws_snapshots: {}
diff --git a/collections/ansible_collections/demo/cloud/roles/aws/tasks/restore_vm.yml b/collections/ansible_collections/demo/cloud/roles/aws/tasks/restore_vm.yml
@@ -59,4 +59,4 @@
         region: "{{ aws_region }}"
         instance_ids: "{{ instance_id }}"
         state: started
-        wait: true
+        wait: true
diff --git a/collections/ansible_collections/demo/cloud/roles/aws/tasks/snapshot_vm.yml b/collections/ansible_collections/demo/cloud/roles/aws/tasks/snapshot_vm.yml
@@ -40,4 +40,3 @@
   ansible.builtin.set_stats:
     data:
       aws_snapshots: "{{ snapshot_stat | items2dict }}"
-
diff --git a/collections/ansible_collections/demo/cloud/roles/aws/vars/snapshot_vm.yml b/collections/ansible_collections/demo/cloud/roles/aws/vars/snapshot_vm.yml
@@ -7,4 +7,4 @@
 #   },
 #   ...
 # ]
-aws_ec2_snapshot_query: "[].{snapshot_id: snapshot_id, vol_id: volume.id, device: volume.attachment_set[?instance_id=='{{ instance_id }}'].device | [0]}"
+aws_ec2_snapshot_query: "[].{snapshot_id: snapshot_id, vol_id: volume.id, device: volume.attachment_set[?instance_id=='{{ instance_id }}'].device | [0]}"