Cloud updates (#85)

Co-authored-by: Gary Bland <gbland@redhat.com>

cloud/blueprints/al2023.yml

@@ -0,0 +1,6 @@
+---
+vm_providers:
+  - aws
+aws_instance_size: t3.micro
+aws_image_architecture: x86_64
+aws_image_filter: 'al2023-ami-2023*'

cloud/create_infra.yml

@@ -1,12 +0,0 @@
----
-- name: Create Cloud Infra
-  hosts: localhost
-  gather_facts: false
-  vars:
-    infra_provider: undef
-    aws_public_key: undef
-  tasks:
-    - name: Include provider role
-      ansible.builtin.include_role:
-        name: "demo.cloud.{{ infra_provider }}"
-        tasks_from: create_infra

cloud/create_vm.yml

@@ -1,25 +0,0 @@
----
-- name: Create Cloud Infra
-  hosts: localhost
-  gather_facts: false
-  vars:
-    vm_name: undef
-    vm_owner: undef
-    vm_provider: undef
-    vm_blueprint: undef
-
-  tasks:
-    - name: "Importing {{ vm_blueprint | upper }}"
-      ansible.builtin.include_vars:
-        file: "blueprints/{{ vm_blueprint }}.yml"
-
-    - name: "Check Provider Compatibility"
-      ansible.builtin.assert:
-        that: "'{{ vm_provider }}' in {{ vm_blueprint_providers }}"
-        fail_msg: "{{ vm_blueprint | upper }} is not available for {{ vm_provider | upper }}"
-      when: "vm_blueprint_providers is defined"
-
-    - name: "Building {{ vm_blueprint | upper }}"
-      ansible.builtin.include_role:
-        name: "demo.cloud.{{ vm_provider }}"
-        tasks_from: create_vm

cloud/setup.yml

@@ -19,8 +19,7 @@ controller_projects:
     organization: Default
     scm_type: git
     wait: true
-    # scm_url: https://github.com/ansible-content-lab/aws.infrastructure_config_demos.git
-    scm_url: https://github.com/willtome/aws.infrastructure_config_demos.git
+    scm_url: https://github.com/ansible-content-lab/aws.infrastructure_config_demos.git
     default_environment: Cloud Services Execution Environment
 
 controller_credentials:
@@ -43,7 +42,7 @@ controller_inventory_sources:
   - name: AWS Inventory
     organization: Default
     source: ec2
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     credential: AWS
     overwrite: true
     source_vars:
@@ -66,7 +65,7 @@ controller_inventory_sources:
   # - name: Azure Inventory
   #   organization: Default
   #   source: azure_rm
-  #  inventory: Workshop Inventory
+  #  inventory: Demo Inventory
   #   credential: Azure
   #   execution_environment: Ansible Engine 2.9 execution environment
   #   overwrite: true
@@ -82,7 +81,7 @@ controller_inventory_sources:
 
 controller_groups:
   - name: cloud_aws
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     variables:
       ansible_user: ec2-user
 
@@ -94,7 +93,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_create_peer_network.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -110,7 +109,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_delete_peer_network.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -124,7 +123,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_create_transit_network.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -140,7 +139,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_delete_transit_network.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -154,7 +153,7 @@ controller_templates:
       - AWS
     project: Ansible official demo project
     playbook: cloud/create_vpc.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -182,25 +181,22 @@ controller_templates:
     organization: Default
     credentials:
       - AWS
-      - Workshop Credential
+      - Demo Credential
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_create_vm.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     survey_enabled: true
     allow_simultaneous: true
-    extra_vars:
-      aws_region: us-east-1
-      aws_keypair_name: aws-test-key
     survey:
       name: ''
       description: ''
       spec:
         - question_name: AWS Region
           type: multiplechoice
-          variable: aws_region
+          variable: create_vm_aws_region
           required: true
           choices:
             - us-east-1
@@ -209,19 +205,19 @@ controller_templates:
             - us-west-2
         - question_name: Name
           type: text
-          variable: vm_name
+          variable: create_vm_vm_name
           required: true
         - question_name: Owner
           type: text
-          variable: vm_owner
+          variable: create_vm_vm_owner
           required: true
         - question_name: Deployment
           type: text
-          variable: vm_deployment
+          variable: create_vm_vm_deployment
           required: true
         - question_name: Environment
           type: multiplechoice
-          variable: vm_environment
+          variable: create_vm_vm_environment
           required: true
           choices:
             - Dev
@@ -237,26 +233,32 @@ controller_templates:
             - rhel9
             - rhel8
             - rhel7
+            - al2023
         - question_name: Subnet
           type: text
-          variable: aws_vpc_subnet_name
+          variable: create_vm_aws_vpc_subnet_name
           required: true
           default: aws-test-subnet
         - question_name: Security Group
           type: text
-          variable: aws_securitygroup_name
+          variable: create_vm_aws_securitygroup_name
           required: true
           default: aws-test-sg
+        - question_name: SSH Keypair
+          type: text
+          variable: create_vm_aws_keypair_name
+          required: true
+          default: aws-test-key
 
   - name: Cloud / AWS / Delete VM
     job_type: run
     organization: Default
     credentials:
       - AWS
-      - Workshop Credential
+      - Demo Credential
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_delete_inventory_vm.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -279,7 +281,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_create_reports.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -294,7 +296,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_create_reports.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -322,7 +324,7 @@ controller_templates:
       - AWS
     project: Ansible official demo project
     playbook: cloud/aws_key.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry