Merge branch 'main' into cloud

cloud/blueprints/windows_core.yml

@@ -0,0 +1,6 @@
+---
+vm_blueprint_providers:
+ - aws
+aws_image_filter: 'Windows_Server-2019-English-Core-Base*'
+aws_instance_size: t3.medium
+aws_userdata_template: aws_windows_userdata

cloud/blueprints/windows_full.yml

@@ -0,0 +1,6 @@
+---
+vm_blueprint_providers:
+ - aws
+aws_image_filter: 'Windows_Server-2019-English-Full-Base*'
+aws_instance_size: t3.medium
+aws_userdata_template: aws_windows_userdata

cloud/destroy_vm.yml

@@ -4,12 +4,16 @@
 
   tasks:
   - name: list systems to be destroyed
+    debug:
+      msg: "{{ inventory_hostname }}"
+
+  - name: pause for review...
     pause:
       seconds: 30
-      prompt: "{{ inventory_hostname }} will be DESTROYED in 30 seconds. Cancel the job to Abort."
+      prompt: "Systems listed above will be DESTROYED in 30 seconds. Cancel the job to Abort."
 
   - name: destroy vm
     include_role:
       name: "demo.cloud.aws"
       tasks_from: destroy_vm
-    when: "'cloud_aws' in group_names or 'cloud_azure' in group_names"
+    when: "'cloud_aws' in group_names or 'cloud_azure' in group_names"

cloud/setup.yml

@@ -16,7 +16,7 @@ controller_credentials:
     inputs:
       username: REPLACEME
       password: REPLACEME
-    
+
   - name: Azure
     credential_type: Microsoft Azure Resource Manager
     organization: Default
@@ -59,7 +59,6 @@ controller_inventory_sources:
       conditional_groups:
         cloud_azure: true
 
-
 controller_templates:
   - name: Cloud / Create Infra
     job_type: run
@@ -68,6 +67,7 @@ controller_templates:
     credentials: 
      - AWS
      - Azure
+
     project: Ansible official demo project
     playbook: cloud/create_infra.yml
     inventory: Workshop Inventory
@@ -129,6 +129,30 @@ controller_templates:
           variable: vm_blueprint
           required: true
           choices: #"{{ lookup('fileglob', 'blueprints/*.yml') | regex_replace(',','\n') | regex_findall('.*/(.*)(?=.yml)') | list }}"
-            - windows
+            - windows_core
+            - windows_full
             - rhel8
             - rhel7
+  - name: Cloud / Destroy VM
+    job_type: run
+    organization: Default
+    credentials: 
+     - AWS
+     - Azure
+     - Workshop Credential
+    project: Ansible official demo project
+    playbook: cloud/destroy_vm.yml
+    inventory: Workshop Inventory
+    execution_environment: Default execution environment
+    survey_enabled: true
+    extra_vars:
+      aws_region: us-east-2
+    survey:
+      name: ''
+      description: ''
+      spec:
+        - question_name: Name or Pattern
+          type: text
+          variable: HOSTS
+          required: true
+