improve alignment of EEs to job templates

* default EEs are defined at the project level for each demo suite
* explicit EEs are now only defined for job templates which need to
  override the project default

Author: jce-redhat

cloud/setup.yml

@@ -152,6 +152,7 @@ controller_templates:
     credentials:
       - AWS
     project: Ansible official demo project
+    execution_environment: Cloud Services Execution Environment
     playbook: cloud/create_vpc.yml
     inventory: Demo Inventory
     notification_templates_started: Telemetry
@@ -342,6 +343,7 @@ controller_templates:
     credentials:
       - AWS
     project: Ansible official demo project
+    execution_environment: Cloud Services Execution Environment
     playbook: cloud/aws_key.yml
     inventory: Demo Inventory
     notification_templates_started: Telemetry
@@ -381,6 +383,7 @@ controller_templates:
     credentials:
       - AWS
     project: Ansible official demo project
+    execution_environment: Cloud Services Execution Environment
     playbook: cloud/snapshot_ec2.yml
     inventory: Demo Inventory
     notification_templates_started: Telemetry
@@ -412,6 +415,7 @@ controller_templates:
     credentials:
       - AWS
     project: Ansible official demo project
+    execution_environment: Cloud Services Execution Environment
     playbook: cloud/restore_ec2.yml
     inventory: Demo Inventory
     notification_templates_started: Telemetry

linux/setup.yml

@@ -138,7 +138,6 @@ controller_templates:
     inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/patching.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -234,7 +233,6 @@ controller_templates:
     project: "Ansible official demo project"
     playbook: linux/fact_scan.yml
     inventory: Demo Inventory
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry

network/setup.yml

@@ -49,7 +49,6 @@ controller_templates:
     survey_enabled: true
     project: Network Golden Configs
     playbook: main.yml
-    execution_environment: Networking Execution Environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -82,10 +81,10 @@ controller_templates:
     inventory: Network Inventory
     project: "Ansible official demo project"
     playbook: "network/report.yml"
+    execution_environment: Networking Execution Environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
-    execution_environment: Networking Execution Environment
     use_fact_cache: true
     credentials:
       - "Demo Credential"

setup_demo.yml

@@ -10,15 +10,13 @@
       loop: "{{ controller_components }}"
       vars:  # noqa var-naming[no-role-prefix]
         controller_components:
+          - execution_environments
           - notification_templates
           - job_templates
           - settings
         controller_execution_environments:
           - name: product-demos
             image: http://quay.io/acme_corp/product-demos-ee:latest
-        controller_organizations:
-          - name: Default
-            default_environment: product-demos
         controller_notifications:
           - name: Telemetry
             organization: Default