remvoe default vpc region

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

README.md

@@ -27,7 +27,7 @@ If you would like to contribute to this project please refer to [contribution gu
 3. Finally, Create a Job Template called `Setup` with the following configuration:
   
      - Name: Setup
-     - Inventory: Workshop Inventory
+     - Inventory: Demo Inventory
      - Exec Env: Control Plane EE
      - Playbook: setup_demo.yml
      - Credentials:

cloud/README.md

@@ -40,7 +40,7 @@ After running the setup job template, there are a few steps required to make the
 
 ### Add Workshop Credential Password
 
-1) Add the password used to login to Controller. This allows you to connect to Windows Servers provisioned with Create VM job. Required until [RFE](https://github.com/ansible/workshops/issues/1597]) is complete
+1) Add a password that meets the [default complexity requirements](https://learn.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/password-must-meet-complexity-requirements#reference). This allows you to connect to Windows Servers provisioned with Create VM job. Required until [RFE](https://github.com/ansible/workshops/issues/1597]) is complete
 
 ### Remove Inventory Variables
 

cloud/aws_key.yml

@@ -10,7 +10,7 @@
       ansible.builtin.assert:
         that:
           - aws_key_name is defined
-          - aws_region is defined
+          - create_vm_aws_region is defined
           - aws_public_key is defined
           - aws_keypair_owner is defined
         fail_msg: "Required variables not set"
@@ -18,7 +18,7 @@
     - name: Create AWS keypair
       amazon.aws.ec2_key:
         name: "{{ aws_key_name }}"
-        region: "{{ aws_region }}"
+        region: "{{ create_vm_aws_region }}"
         key_material: "{{ aws_public_key }}"
         state: present
         tags:

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/create_vpc.yml

@@ -9,7 +9,6 @@
     aws_tenancy: default
     aws_vpc_cidr_block: 10.0.0.0/16
     aws_subnet_cidr: 10.0.1.0/24
-    aws_region: us-east-1
     aws_sg_name: aws-test-sg
     aws_subnet_name: aws-test-subnet
     aws_rt_name: aws-test-rt
@@ -21,7 +20,7 @@
         name: "{{ aws_vpc_name }}"
         cidr_block: "{{ aws_vpc_cidr_block }}"
         tenancy: "{{ aws_tenancy }}"
-        region: "{{ aws_region }}"
+        region: "{{ create_vm_aws_region }}"
         tags:
           owner: "{{ aws_owner_tag }}"
           purpose: "{{ aws_purpose_tag }}"
@@ -31,7 +30,7 @@
       amazon.aws.ec2_vpc_igw:
         state: present
         vpc_id: "{{ aws_vpc.vpc.id }}"
-        region: "{{ aws_region }}"
+        region: "{{ create_vm_aws_region }}"
         tags:
           Name: "{{ aws_vpc_name }}"
           owner: "{{ aws_owner_tag }}"
@@ -42,7 +41,7 @@
       amazon.aws.ec2_security_group:
         state: present
         name: "{{ aws_sg_name }}"
-        region: "{{ aws_region }}"
+        region: "{{ create_vm_aws_region }}"
         description: Inbound WinRM and RDP, http for demo servers and internal AD ports
         rules:
           - proto: tcp
@@ -101,7 +100,7 @@
         state: present
         vpc_id: "{{ aws_vpc.vpc.id }}"
         cidr: "{{ aws_subnet_cidr }}"
-        region: "{{ aws_region }}"
+        region: "{{ create_vm_aws_region }}"
         map_public: true
         tags:
           Name: "{{ aws_subnet_name }}"
@@ -113,7 +112,7 @@
       amazon.aws.ec2_vpc_route_table:
         state: present
         vpc_id: "{{ aws_vpc.vpc.id }}"
-        region: "{{ aws_region }}"
+        region: "{{ create_vm_aws_region }}"
         subnets:
           - "{{ aws_subnet.subnet.id }}"
         routes:

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
@@ -165,7 +164,7 @@ controller_templates:
       spec:
         - question_name: AWS Region
           type: multiplechoice
-          variable: aws_region
+          variable: create_vm_aws_region
           required: true
           choices:
             - us-east-1
@@ -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,32 +233,36 @@ 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
     survey_enabled: true
-    extra_vars:
-      aws_region: us-east-1
     survey:
       name: ''
       description: ''
@@ -279,13 +279,26 @@ 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
     extra_vars:
-      aws_region: us-east-1
       aws_report: vpc
+    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
 
   - name: Cloud / AWS / Tags Report
     job_type: run
@@ -294,7 +307,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
@@ -307,7 +320,7 @@ controller_templates:
       spec:
         - question_name: AWS Region
           type: multiplechoice
-          variable: aws_region
+          variable: create_vm_aws_region
           required: true
           choices:
             - us-east-1
@@ -322,7 +335,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
@@ -333,7 +346,7 @@ controller_templates:
       spec:
         - question_name: AWS Region
           type: multiplechoice
-          variable: aws_region
+          variable: create_vm_aws_region
           required: true
           choices:
             - us-east-1
@@ -370,7 +383,7 @@ controller_workflows:
       spec:
         - question_name: AWS Region
           type: multiplechoice
-          variable: aws_region
+          variable: create_vm_aws_region
           required: true
           choices:
             - us-east-1
@@ -379,7 +392,7 @@ controller_workflows:
             - us-west-2
         - question_name: Owner
           type: text
-          variable: aws_owner_tag
+          variable: create_vm_aws_owner_tag
           required: true
         - question_name: Environment
           type: multiplechoice
@@ -400,8 +413,6 @@ controller_workflows:
     simplified_workflow_nodes:
       - identifier: Create Keypair
         unified_job_template: Cloud / AWS / Create Keypair
-        extra_data:
-          aws_keypair_owner: !unsafe "{{ aws_owner_tag }}"
         success_nodes:
           - VPC Report
         failure_nodes:
@@ -426,9 +437,8 @@ controller_workflows:
       - identifier: Deploy Windows Blueprint
         unified_job_template: Cloud / AWS / Create VM
         extra_data:
-          vm_name: aws_win
+          create_vm_vm_name: aws_win
           vm_blueprint: windows_full
-          vm_owner: !unsafe "{{ aws_owner_tag }}"
         success_nodes:
           - Update Inventory
         failure_nodes:
@@ -436,9 +446,8 @@ controller_workflows:
       - identifier: Deploy RHEL8 Blueprint
         unified_job_template: Cloud / AWS / Create VM
         extra_data:
-          vm_name: aws_rhel8
+          create_vm_vm_name: aws_rhel8
           vm_blueprint: rhel8
-          vm_owner: !unsafe "{{ aws_owner_tag }}"
         success_nodes:
           - Update Inventory
         failure_nodes:
@@ -446,9 +455,8 @@ controller_workflows:
       - identifier: Deploy RHEL9 Blueprint
         unified_job_template: Cloud / AWS / Create VM
         extra_data:
-          vm_name: aws_rhel9
+          create_vm_vm_name: aws_rhel9
           vm_blueprint: rhel9
-          vm_owner: !unsafe "{{ aws_owner_tag }}"
         success_nodes:
           - Update Inventory
         failure_nodes:

collections/ansible_collections/demo/patching/roles/report_linux/tasks/main.yml

@@ -15,7 +15,7 @@
 
 - name: Copy logos over
   ansible.builtin.copy:
-    src: "{{ item }}"
+    src: "{{ logo }}"
     dest: "{{ file_path }}"
     directory_mode: true
     mode: "0644"
@@ -24,6 +24,8 @@
     - "redhat-ansible-logo.svg"
     - "server.png"
   check_mode: false
+  loop_control:
+    loop_var: logo
 
 - name: Display link to inventory report
   ansible.builtin.debug:

collections/ansible_collections/demo/patching/roles/report_windows/tasks/main.yml

@@ -14,7 +14,7 @@
 
 - name: Copy logos over
   ansible.windows.win_copy:
-    src: "{{ item }}"
+    src: "{{ logo }}"
     dest: "{{ file_path }}"
     directory_mode: true
   loop:
@@ -22,6 +22,8 @@
     - "redhat-ansible-logo.svg"
     - "server.png"
   check_mode: false
+  loop_control:
+    loop_var: logo
 
 # - name: display link to inventory report
 #   ansible.builtin.debug:

collections/requirements.yml

@@ -1,14 +1,14 @@
 ---
 collections:
   - name: ansible.controller
-    version: 4.3.0
+    version: 4.4.0
   - name: redhat_cop.controller_configuration
-    version: 2.2.5
+    version: 2.3.1
   # linux
   - name: redhat.insights
     version: 1.0.7
   - name: redhat.rhel_system_roles
-    version: 1.21.1
+    version: 1.20.0
   - name: community.general
     version: 6.3.0
   - name: containers.podman

linux/ec2_register.yml

@@ -2,12 +2,9 @@
 - name: Register ec2 instance with subscription mangler
   hosts: "{{ _hosts | default(omit)  }}"
   become: true
-  vars:
-    registration_state: present
-    insights_state: present
 
   tasks:
-    - name: Check for org_id and activation_key
+    - name: Check for vars
       ansible.builtin.assert:
         that:
           - org_id is defined
@@ -59,19 +56,18 @@
         regexp: '^manage_repos'
         line: 'manage_repos = 1'
 
-    - name: Register with subscription mangler
-      ansible.builtin.include_role:
-        name: redhat.rhel_system_roles.rhc
+    - name: Register subscription mangler
+      community.general.redhat_subscription:
+        state: present
+        activationkey: "{{ activation_key }}"
+        org_id: "{{ org_id }}"
+
+    - name: Configure Red Hat insights
+      ansible.builtin.import_role:
+        name: redhat.insights.insights_client
       vars:
-        rhc_state: "{{ registration_state }}"
-        rhc_organization: "{{ org_id }}"
-        rhc_auth:
-          activation_keys:
-            keys:
-              - "{{ activation_key }}"
-        rhc_insights:
-          state: "{{ insights_state }}"
-          tags:
-            env: "{{ env }}"
-            purpose: demo
-            group: "{{ insights_tag }}"
+        insights_display_name: "{{ inventory_hostname }}"
+        insights_tags:
+          env: "{{ env }}"
+          purpose: demo
+          group: "{{ insights_tag }}"

linux/setup.yml

@@ -37,7 +37,7 @@ controller_credentials:
 
 controller_inventory_sources:
   - name: Insights Inventory
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     source: scm
     source_project: Ansible official demo project
     source_path: linux/inventory.insights.yml
@@ -46,14 +46,14 @@ controller_inventory_sources:
 controller_templates:
   - name: "LINUX / Register with Insights"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/ec2_register.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     extra_vars:
       activation_key: !unsafe "RHEL{{ ansible_distribution_major_version }}_{{ env }}"
@@ -85,7 +85,7 @@ controller_templates:
 
   - name: "LINUX / Troubleshoot"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/tshoot.yml"
     notification_templates_started: Telemetry
@@ -93,7 +93,7 @@ controller_templates:
     notification_templates_error: Telemetry
     use_fact_cache: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -106,14 +106,14 @@ controller_templates:
 
   - name: "LINUX / Temporary Sudo"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/temp_sudo.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -135,7 +135,7 @@ controller_templates:
 
   - name: "LINUX / Patching"
     job_type: check
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/patching.yml"
     execution_environment: Default execution environment
@@ -145,7 +145,7 @@ controller_templates:
     use_fact_cache: true
     ask_job_type_on_launch: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -158,7 +158,7 @@ controller_templates:
 
   - name: "LINUX / Start Service"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/service_start.yml"
     notification_templates_started: Telemetry
@@ -166,7 +166,7 @@ controller_templates:
     notification_templates_error: Telemetry
     use_fact_cache: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -183,7 +183,7 @@ controller_templates:
 
   - name: "LINUX / Stop Service"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/service_stop.yml"
     notification_templates_started: Telemetry
@@ -191,7 +191,7 @@ controller_templates:
     notification_templates_error: Telemetry
     use_fact_cache: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -208,14 +208,14 @@ controller_templates:
 
   - name: "LINUX / Run Shell Script"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/run_script.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -233,14 +233,14 @@ controller_templates:
   - name: "LINUX / Fact Scan"
     project: "Ansible official demo project"
     playbook: linux/fact_scan.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     use_fact_cache: true
     credentials:
-      - Workshop Credential
+      - Demo Credential
     survey_enabled: true
     survey:
       name: ''
@@ -253,14 +253,14 @@ controller_templates:
 
   - name: "LINUX / Podman Webserver"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/podman.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -278,7 +278,7 @@ controller_templates:
 
   - name: "LINUX / System Roles"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/system_roles.yml"
     notification_templates_started: Telemetry
@@ -292,7 +292,7 @@ controller_templates:
       selinux_policy: targeted
       selinux_state: enforcing
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -305,7 +305,7 @@ controller_templates:
 
   - name: "LINUX / Install Web Console (cockpit)"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/system_roles.yml"
     notification_templates_started: Telemetry
@@ -317,7 +317,7 @@ controller_templates:
       system_roles:
         - cockpit
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -339,14 +339,14 @@ controller_templates:
 
   - name: "LINUX / DISA STIG"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/compliance.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     extra_vars:
       sudo_remove_nopasswd: false
     survey_enabled: true
@@ -361,11 +361,11 @@ controller_templates:
 
   - name: "LINUX / Insights Compliance Scan"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/insights_compliance_scan.yml"
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -386,7 +386,7 @@ controller_templates:
 
   - name: "LINUX / Deploy Application"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/deploy_application.yml"
     notification_templates_started: Telemetry
@@ -394,7 +394,7 @@ controller_templates:
     notification_templates_error: Telemetry
     use_fact_cache: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''

network/setup.yml

@@ -88,7 +88,7 @@ controller_templates:
     execution_environment: Networking Execution Environment
     use_fact_cache: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''

satellite/setup.yml

@@ -52,7 +52,7 @@ controller_credentials:
 
 controller_inventory_sources:
   - name: Satellite Inventory
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     credential: Satellite Inventory
     source: satellite6
     update_on_launch: false
@@ -81,12 +81,12 @@ controller_templates:
   - name: LINUX / Register with Satellite
     project: Ansible official demo project
     playbook: satellite/server_register.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - Workshop Credential
+      - Demo Credential
       - Satellite Credential
     extra_vars:
       org_id: "Default_Organization"
@@ -111,14 +111,14 @@ controller_templates:
   - name: LINUX / Compliance Scan with Satellite
     project: Ansible official demo project
     playbook: satellite/server_openscap.yml
-    inventory: Workshop Inventory
-    execution_environment: Ansible Engine 2.9 execution environment
+    inventory: Demo Inventory
+    # execution_environment: Ansible Engine 2.9 execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
       - Satellite Credential
-      - Workshop Credential
+      - Demo Credential
     extra_vars:
       policy_scan: all
     survey_enabled: true
@@ -134,7 +134,7 @@ controller_templates:
   - name: SATELLITE / Publish Content View Version
     project: Ansible official demo project
     playbook: satellite/satellite_publish.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -156,7 +156,7 @@ controller_templates:
   - name: SATELLITE / Promote Content View Version
     project: Ansible official demo project
     playbook: satellite/satellite_promote.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -186,7 +186,7 @@ controller_templates:
   - name: SETUP / Satellite
     project: Ansible official demo project
     playbook: satellite/setup_satellite.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry

setup_demo.yml

@@ -30,7 +30,7 @@
         controller_templates:
           - name: "SUBMIT FEEDBACK"
             job_type: run
-            inventory: "Workshop Inventory"
+            inventory: "Demo Inventory"
             project: "Ansible official demo project"
             playbook: "feedback.yml"
             execution_environment: Default execution environment

windows/README.md

@@ -19,11 +19,14 @@ This category of demos shows examples of Windows Server operations and managemen
 - [**WINDOWS / Arbitrary Powershell**](arbitrary_powershell.yml) - Run given Powershell script (default: retrieve cat fact from API)
 - [**WINDOWS / Powershell Script**](powershell_script.yml) - Run a Powershell script stored in source control to query services
 - [**WINDOWS / Powershell DSC configuring password requirements**](powershell_dsc.yml) - Configure password complexity with Powershell desired state config
-- [**WINDOWS / Create Active Directory Domain**](active_directory/create_ad_domain.yml) - Create a new AD Domain
-- [**WINDOWS / Helpdesk new user portal**](active_directory/helpdesk_new_user_portal.yml) - Create user in AD Domain
+- [**WINDOWS / Create Active Directory Domain**](create_ad_domain.yml) - Create a new AD Domain
+- [**WINDOWS / Helpdesk new user portal**](helpdesk_new_user_portal.yml) - Create user in AD Domain
+- [**WINDOWS / Join Active Directory Domain**](join_ad_domain.yml) - Join computer to AD Domain
 
 ## Suggested Usage
 
 **WINDOWS / Create Active Directory Domain** - This job can take some to complete. It is recommended to run ahead of time if you would like to demo creating a helpdesk user.
 
 **WINDOWS / Helpdesk new user portal** - This job is dependant on the Create Active Directory Domain completing before users can be created.
+
+**WINDOWS / Join Active Directory Domain** - This job is dependant on the Create Active Directory Domain completing before computers can be joined.

windows/join_ad_domain.yml

@@ -0,0 +1,30 @@
+---
+- name: Join Active Directory domain
+  hosts: "{{ _hosts | default(omit) }}"
+  gather_facts: false
+
+  tasks:
+    - name: Set a single address on the adapter named Ethernet
+      ansible.windows.win_dns_client:
+        adapter_names: 'Ethernet*'
+        dns_servers: "{{ hostvars[domain_controller]['private_ip_address'] }}"
+
+    - name: Ensure Demo OU exists
+      delegate_to: "{{ domain_controller }}"
+      community.windows.win_domain_ou:
+        name: Demo
+        state: present
+
+    - name: Join ansible.local domain
+      register: r_domain_membership
+      ansible.windows.win_domain_membership:
+        dns_domain_name: ansible.local
+        hostname: "{{ inventory_hostname }}"
+        domain_admin_user: "{{ ansible_user }}@ansible.local"
+        domain_admin_password: "{{ ansible_password }}"
+        domain_ou_path: "OU=Demo,DC=ansible,DC=local"
+        state: domain
+
+    - name: Reboot windows machine
+      when: r_domain_membership.reboot_required
+      ansible.windows.win_reboot:

windows/setup.yml

@@ -15,14 +15,14 @@ controller_projects:
 controller_templates:
   - name: "WINDOWS / Install IIS"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/install_iis.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -41,7 +41,7 @@ controller_templates:
     use_fact_cache: true
     job_type: check
     ask_job_type_on_launch: true
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/patching.yml"
     execution_environment: Default execution environment
@@ -49,7 +49,7 @@ controller_templates:
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -87,14 +87,14 @@ controller_templates:
 
   - name: "WINDOWS / Chocolatey install multiple"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/windows_choco_multiple.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -107,14 +107,14 @@ controller_templates:
 
   - name: "WINDOWS / Chocolatey install specific"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/windows_choco_specific.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -131,14 +131,14 @@ controller_templates:
 
   - name: "WINDOWS / Run PowerShell"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/powershell.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -156,14 +156,14 @@ controller_templates:
 
   - name: "WINDOWS / Query Services"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/powershell_script.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -184,14 +184,14 @@ controller_templates:
 
   - name: "WINDOWS / Configuring Password Requirements"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/powershell_dsc.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -202,16 +202,16 @@ controller_templates:
           variable: _hosts
           required: false
 
-  - name: "WINDOWS / AD /Create Domain"
+  - name: "WINDOWS / AD / Create Domain"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/create_ad_domain.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -222,16 +222,41 @@ controller_templates:
           variable: _hosts
           required: false
 
+  - name: "WINDOWS / AD / Join Domain"
+    job_type: run
+    inventory: "Demo Inventory"
+    project: "Ansible official demo project"
+    playbook: "windows/join_ad_domain.yml"
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    credentials:
+      - "Demo Credential"
+    survey_enabled: true
+    survey:
+      name: ''
+      description: ''
+      spec:
+        - question_name: Server Name or Pattern
+          type: text
+          variable: _hosts
+          required: true
+        - question_name: Domain Controller Inventory Hostname
+          type: text
+          variable: domain_controller
+          required: true
+          description: Inventory hostname for domain controller previously established using the Create Domain template
+
   - name: "WINDOWS / AD / New User"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/helpdesk_new_user_portal.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -268,14 +293,14 @@ controller_templates:
 
   - name: "WINDOWS / DISA STIG"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/compliance.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''