fix JT name

use new job template name
change project name
2024-10-23 17:26:14 -04:00 · 2024-10-23 17:24:25 -04:00 · 2024-10-23 12:33:39 -04:00 · 2024-10-23 11:45:35 -04:00 · 2024-10-23 11:42:06 -04:00 · 2024-10-23 11:37:01 -04:00
9 changed files with 63 additions and 110 deletions
--- a/collections/requirements.yml
+++ b/collections/requirements.yml
@@ -1,53 +1,6 @@
 ---
-# This file is mainly used by product-demos CI,
-# See cloin/ee-builds/product-demos-ee/requirements.yml
-# for configuring collections and collection versions.
 collections:
-  - name: ansible.controller
-    version: ">=4.5.5"
-  - name: infra.ah_configuration
-    version: ">=2.0.6"
-  - name: infra.controller_configuration
-    version: ">=2.7.1"
-  - name: redhat_cop.controller_configuration
-    version: ">=2.3.1"
-  # linux
-  - name: ansible.posix
-    version: ">=1.5.4"
-  - name: community.general
-    version: ">=8.0.0"
-  - name: containers.podman
-    version: ">=1.12.1"
-  - name: redhat.insights
-    version: ">=1.2.2"
-  - name: redhat.rhel_system_roles
-    version: ">=1.23.0"
-  # windows
-  - name: ansible.windows
-    version: ">=2.3.0"
-  - name: chocolatey.chocolatey
-    version: ">=1.5.1"
-  - name: community.windows
-    version: ">=2.2.0"
-  # cloud
-  - name: amazon.aws
-    version: ">=7.5.0"
-  # satellite
-  - name: redhat.satellite
-    version: ">=4.0.0"
-  # network
-  - name: ansible.netcommon
-    version: ">=6.0.0"
-  - name: cisco.ios
-    version: ">=7.0.0"
-  - name: cisco.iosxr
-    version: ">=8.0.0"
-  - name: cisco.nxos
-    version: ">=7.0.0"
-  # openshift
-  - name: kubernetes.core
-    version: ">=4.0.0"
-  - name: redhat.openshift
-    version: ">=3.0.1"
-  - name: redhat.openshift_virtualization
-    version: ">=1.4.0"
+  - name: infra.aap_configuration
+    type: git
+    source: https://github.com/redhat-cop/infra.aap_configuration.git
+...
--- a/common/setup.yml
+++ b/common/setup.yml
@@ -78,7 +78,7 @@ controller_templates:
  - name: SUBMIT FEEDBACK
    job_type: run
    inventory: Demo Inventory
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: feedback.yml
    execution_environment: Default execution environment
    notification_templates_started: Telemetry
@@ -103,7 +103,7 @@ controller_templates:
    organization: Default
    credentials:
      - AWS
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: cloud/create_vpc.yml
    inventory: Demo Inventory
    notification_templates_started: Telemetry
@@ -133,7 +133,7 @@ controller_templates:
    organization: Default
    credentials:
      - AWS
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: cloud/aws_key.yml
    inventory: Demo Inventory
    notification_templates_started: Telemetry
@@ -284,7 +284,7 @@ controller_notifications:
      url: https://script.google.com/macros/s/AKfycbzxUObvCJ6ZbzfJyicw4RvxlGE3AZdrK4AR5-TsedCYd7O-rtTOVjvsRvqyb3rx6B0g8g/exec
      http_method: POST
      headers: {}
-
-controller_settings:
-  - name: SESSION_COOKIE_AGE
-    value: 180000
+# Has this moved out of controller?
+# controller_settings:
+#   - name: SESSION_COOKIE_AGE
+#     value: 180000
--- a/linux/setup.yml
+++ b/linux/setup.yml
@@ -36,7 +36,7 @@ controller_inventory_sources:
  - name: Insights Inventory
    inventory: Demo Inventory
    source: scm
-    source_project: Ansible official demo project
+    source_project: Ansible Product Demos
    source_path: linux/inventory.insights.yml
    credential: Insights Inventory

@@ -44,7 +44,7 @@ controller_templates:
  - name: "LINUX / Register with Insights"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/ec2_register.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -83,7 +83,7 @@ controller_templates:
  - name: "LINUX / Troubleshoot"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/tshoot.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -104,7 +104,7 @@ controller_templates:
  - name: "LINUX / Temporary Sudo"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/temp_sudo.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -133,7 +133,7 @@ controller_templates:
  - name: "LINUX / Patching"
    job_type: check
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/patching.yml"
    execution_environment: Default execution environment
    notification_templates_started: Telemetry
@@ -156,7 +156,7 @@ controller_templates:
  - name: "LINUX / Start Service"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/service_start.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -181,7 +181,7 @@ controller_templates:
  - name: "LINUX / Stop Service"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/service_stop.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -206,7 +206,7 @@ controller_templates:
  - name: "LINUX / Run Shell Script"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/run_script.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -228,7 +228,7 @@ controller_templates:
          required: true

  - name: "LINUX / Fact Scan"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: linux/fact_scan.yml
    inventory: Demo Inventory
    execution_environment: Default execution environment
@@ -251,7 +251,7 @@ controller_templates:
  - name: "LINUX / Podman Webserver"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/podman.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -276,7 +276,7 @@ controller_templates:
  - name: "LINUX / System Roles"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/system_roles.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -303,7 +303,7 @@ controller_templates:
  - name: "LINUX / Install Web Console (cockpit)"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/system_roles.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -337,7 +337,7 @@ controller_templates:
  - name: "LINUX / DISA STIG"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/compliance.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -359,7 +359,7 @@ controller_templates:
  - name: "LINUX / Multi-profile Compliance"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/compliance-enforce.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -405,7 +405,7 @@ controller_templates:
  - name: "LINUX / Multi-profile Compliance Report"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/compliance-report.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -445,7 +445,7 @@ controller_templates:
  - name: "LINUX / Insights Compliance Scan"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/insights_compliance_scan.yml"
    credentials:
      - "Demo Credential"
@@ -470,7 +470,7 @@ controller_templates:
  - name: "LINUX / Deploy Application"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "linux/deploy_application.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
--- a/multi_select_setup.yml
+++ b/multi_select_setup.yml
@@ -4,7 +4,7 @@
  gather_facts: false
  vars:
    launch_jobs:
-      name: "SETUP"
+      name: "Product Demos | Single demo setup"
      wait: true
  tasks:
    - name: Build controller launch jobs
--- a/network/setup.yml
+++ b/network/setup.yml
@@ -64,7 +64,7 @@ controller_templates:
    job_type: check
    organization: Default
    inventory: Demo Inventory
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "network/report.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -93,7 +93,7 @@ controller_templates:
    job_type: check
    organization: Default
    inventory: Demo Inventory
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "network/compliance.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
--- a/openshift/setup.yml
+++ b/openshift/setup.yml
@@ -21,7 +21,7 @@ controller_inventory_sources:
  - name: OpenShift CNV Inventory
    inventory: Demo Inventory
    source: scm
-    source_project: Ansible official demo project
+    source_project: Ansible Product Demos
    source_path: openshift/inventory.kubevirt.yml
    credential: OpenShift Credential
    update_on_launch: false
@@ -31,7 +31,7 @@ controller_templates:
  - name: OpenShift / EDA / Install Controller
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "openshift/eda/install.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -44,7 +44,7 @@ controller_templates:
  - name: OpenShift / CNV / Install Operator
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "openshift/cnv/install.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -56,7 +56,7 @@ controller_templates:
  - name: OpenShift / CNV / Create RHEL VM
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "openshift/cnv/provision_rhel.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -100,7 +100,7 @@ controller_templates:
  - name: OpenShift / CNV / Create VM Snapshots
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "openshift/cnv/snapshot.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -128,7 +128,7 @@ controller_templates:
  - name: OpenShift / CNV / Restore Latest VM Snapshots
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "openshift/cnv/snapshot.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -156,7 +156,7 @@ controller_templates:
  - name: OpenShift / CNV / Delete VM
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "openshift/cnv/delete.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -184,7 +184,7 @@ controller_templates:
  - name: OpenShift / CNV / Patch
    job_type: check
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "openshift/cnv/patch.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -206,7 +206,7 @@ controller_templates:

  - name: OpenShift / CNV / Wait Hosts
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "openshift/cnv/wait.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -225,7 +225,7 @@ controller_templates:
  - name: OpenShift / Dev Spaces
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "openshift/devspaces.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -236,7 +236,7 @@ controller_templates:
  - name: OpenShift / GitLab
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "openshift/gitlab.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -312,7 +312,7 @@ controller_workflows:
          default: "openshift-cnv-rhel*"
    simplified_workflow_nodes:
      - identifier: Project Sync
-        unified_job_template: Ansible official demo project
+        unified_job_template: Ansible Product Demos
        success_nodes:
          - Patch Instance
      # We need to do an invnetory sync *after* creating snapshots, as turning VMs on/off changes their IP
--- a/satellite/setup.yml
+++ b/satellite/setup.yml
@@ -74,7 +74,7 @@ controller_inventory_sources:

 controller_templates:
  - name: LINUX / Register with Satellite
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: satellite/server_register.yml
    inventory: Demo Inventory
    notification_templates_started: Telemetry
@@ -104,7 +104,7 @@ controller_templates:
          required: true

  - name: LINUX / Compliance Scan with Satellite
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: satellite/server_openscap.yml
    inventory: Demo Inventory
    # execution_environment: Ansible Engine 2.9 execution environment
@@ -127,7 +127,7 @@ controller_templates:
          required: false

  - name: SATELLITE / Publish Content View Version
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: satellite/satellite_publish.yml
    inventory: Demo Inventory
    notification_templates_started: Telemetry
@@ -149,7 +149,7 @@ controller_templates:
          required: true

  - name: SATELLITE / Promote Content View Version
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: satellite/satellite_promote.yml
    inventory: Demo Inventory
    notification_templates_started: Telemetry
@@ -179,7 +179,7 @@ controller_templates:
          required: true

  - name: SETUP / Satellite
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: satellite/setup_satellite.yml
    inventory: Demo Inventory
    notification_templates_started: Telemetry
--- a/setup_demo.yml
+++ b/setup_demo.yml
@@ -16,7 +16,7 @@

    - name: Create common demo resources
      ansible.builtin.include_role:
-        name: infra.controller_configuration.dispatch
+        name: infra.aap_configuration.dispatch

 - name: Setup demo
  hosts: localhost
@@ -27,7 +27,7 @@

    - name: Demo Components
      ansible.builtin.include_role:
-        name: infra.controller_configuration.dispatch
+        name: infra.aap_configuration.dispatch

    - name: Log Demo
      ansible.builtin.uri:
--- a/windows/setup.yml
+++ b/windows/setup.yml
@@ -12,7 +12,7 @@ controller_templates:
  - name: "WINDOWS / Install IIS"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/install_iis.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -38,7 +38,7 @@ controller_templates:
    job_type: check
    ask_job_type_on_launch: true
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/patching.yml"
    execution_environment: Default execution environment
    notification_templates_started: Telemetry
@@ -84,7 +84,7 @@ controller_templates:
  - name: "WINDOWS / Rollback"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/rollback.yml"
    execution_environment: Default execution environment
    notification_templates_started: Telemetry
@@ -109,7 +109,7 @@ controller_templates:
  - name: "WINDOWS / Test Connectivity"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/connect.yml"
    execution_environment: Default execution environment
    notification_templates_started: Telemetry
@@ -130,7 +130,7 @@ controller_templates:
  - name: "WINDOWS / Chocolatey install multiple"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/windows_choco_multiple.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -150,7 +150,7 @@ controller_templates:
  - name: "WINDOWS / Chocolatey install specific"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/windows_choco_specific.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -174,7 +174,7 @@ controller_templates:
  - name: "WINDOWS / Run PowerShell"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/powershell.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -199,7 +199,7 @@ controller_templates:
  - name: "WINDOWS / Query Services"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/powershell_script.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -227,7 +227,7 @@ controller_templates:
  - name: "WINDOWS / Configuring Password Requirements"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/powershell_dsc.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -247,7 +247,7 @@ controller_templates:
  - name: "WINDOWS / AD / Create Domain"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/create_ad_domain.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -267,7 +267,7 @@ controller_templates:
  - name: "WINDOWS / AD / Join Domain"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/join_ad_domain.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -292,7 +292,7 @@ controller_templates:
  - name: "WINDOWS / AD / New User"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/helpdesk_new_user_portal.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
@@ -336,7 +336,7 @@ controller_templates:
  - name: "WINDOWS / DISA STIG"
    job_type: run
    inventory: "Demo Inventory"
-    project: "Ansible official demo project"
+    project: "Ansible Product Demos"
    playbook: "windows/compliance.yml"
    notification_templates_started: Telemetry
    notification_templates_success: Telemetry
Author	SHA1	Message	Date
Chris Edillon	4eb0ec2e6b	fix JT name	2024-10-23 17:26:14 -04:00
Chris Edillon	0b82706cc2	use new job template name	2024-10-23 17:24:25 -04:00
willtome	494d95a53a	change project name	2024-10-23 12:33:39 -04:00
willtome	9b11779c2c	remove session age	2024-10-23 11:45:35 -04:00
willtome	95ebba694f	update to aap	2024-10-23 11:42:06 -04:00
willtome	93ce1d29b5	updates for 2.5	2024-10-23 11:37:01 -04:00