From a257597a7db03cccf8925956d921da2ea3a1ca82 Mon Sep 17 00:00:00 2001
From: Sean Cavanaugh <sean@cavanaugh.pro>
Date: Tue, 24 Sep 2024 09:28:42 -0400
Subject: [PATCH] Fix Cloud Report (#190)

---
 cloud/setup.yml  | 21 ++++-----------------
 common/setup.yml |  7 +++++++
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/cloud/setup.yml b/cloud/setup.yml
index b7aea3f..d23e7dc 100644
--- a/cloud/setup.yml
+++ b/cloud/setup.yml
@@ -69,29 +69,16 @@ controller_templates:
     organization: Default
     credentials:
       - AWS
-    project: Ansible Cloud Content Lab - AWS
-    playbook: playbooks/create_reports.yml
+    project: Ansible Cloud AWS Demos
+    playbook: playbooks/cloud_report.yml
     inventory: Demo Inventory
+    execution_environment: Cloud Services Execution Environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     extra_vars:
-      aws_report: vpc
       reports_aws_bucket_name: reports-pd-{{ _deployment_id }}
-    survey_enabled: true
-    survey:
-      name: ''
-      description: ''
-      spec:
-        - question_name: AWS Region
-          type: multiplechoice
-          variable: create_vm_aws_region
-          required: true
-          choices:
-            - us-east-1
-            - us-east-2
-            - us-west-1
-            - us-west-2
+      reports_aws_region: "us-east-1"
 
   - name: Cloud / AWS / Tags Report
     job_type: run
diff --git a/common/setup.yml b/common/setup.yml
index ca88c95..ba60fdd 100644
--- a/common/setup.yml
+++ b/common/setup.yml
@@ -17,6 +17,13 @@ controller_projects:
     scm_url: https://github.com/ansible-content-lab/aws.infrastructure_config_demos.git
     default_environment: Cloud Services Execution Environment
 
+  - name: Ansible Cloud AWS Demos
+    organization: Default
+    scm_type: git
+    wait: true
+    scm_url: https://github.com/ansible-cloud/aws_demos.git
+    default_environment: Cloud Services Execution Environment
+
 controller_credentials:
   - name: AWS
     credential_type: Amazon Web Services