add playbook

Add RHDP dependencies to APD EE definition (#203 )
A few small bug fixes around OCP CNV demos (#202 )
2024-11-18 21:03:20 -05:00 · 2024-11-18 16:18:54 -05:00 · 2024-11-12 08:47:39 -07:00 · 2024-11-11 15:04:03 -07:00 · 2024-11-11 11:02:47 -05:00 · 2024-11-05 11:53:57 -05:00
27 changed files with 199 additions and 136 deletions
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -10,3 +10,4 @@ exclude_paths:
  - collections/ansible_collections/demo/compliance/roles/
  - roles/redhatofficial.*
  - .github/
+  - execution_environments/ee_contexts/
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -5,7 +5,8 @@ on:
 - pull_request_target

 env:
-  ANSIBLE_GALAXY_SERVER_AH_TOKEN: ${{ secrets.ANSIBLE_GALAXY_SERVER_AH_TOKEN }}
+  ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN: ${{ secrets.ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN }}
+  ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN: ${{ secrets.ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN }}

 jobs:
  pre-commit:
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,9 +3,6 @@ repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v4.4.0
    hooks:
-      - id: end-of-file-fixer
-        exclude: rhel[89]STIG/.*$
-
      - id: trailing-whitespace
        exclude: rhel[89]STIG/.*$

--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-    "editor.renderWhitespace": "all"
+    "editor.renderWhitespace": "all",
+    "ansible.python.interpreterPath": "/usr/local/bin/python3"
 }
--- a/README.md
+++ b/README.md
@@ -1,16 +1,18 @@
 [![Lab](https://img.shields.io/badge/Try%20Me-EE0000?style=for-the-badge&logo=redhat&logoColor=white)](https://red.ht/aap-product-demos)
 [![Dev Spaces](https://img.shields.io/badge/Customize%20Here-0078d7.svg?style=for-the-badge&logo=visual-studio-code&logoColor=white)](https://workspaces.openshift.com/f?url=https://github.com/ansible/product-demos)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)

 # Official Ansible Product Demos

-This is a centralized location for Ansible Product Demos. This project is a collection of use cases implemented with Ansible for use with the Ansible Automation Platform.
+This is a centralized location for Ansible Product Demos. This project is a collection of use cases implemented with Ansible for use with the [Ansible Automation Platform](https://www.redhat.com/en/technologies/management/ansible).

 | Demo Name | Description |
 |-----------|-------------|
 | [Linux](linux/README.md) | Repository of demos for RHEL and Linux automation |
 | [Windows](windows/README.md) | Repository of demos for Windows Server automation |
 | [Cloud](cloud/README.md) | Demo for infrastructure and cloud provisioning automation |
-| [Network](network/README.md) | Ansible Network automation demos |
+| [Network](network/README.md) | Network automation demos |
+| [OpenShift](openshift/README.md) | OpenShift automation demos |
 | [Satellite](satellite/README.md) | Demos of automation with Red Hat Satellite Server |

 ## Contributions
@@ -19,7 +21,7 @@ If you would like to contribute to this project please refer to [contribution gu

 ## Using this project

-This project is tested for compatibility with the [demo.redhat.com Product Demos Sandbox](https://demo.redhat.com/catalog?search=product+demos&item=babylon-catalog-prod%2Fopenshift-cnv.aap-product-demos-cnv.prod) lab environment. To use with other Ansible Controller installations, review the [prerequisite documentation](https://github.com/RedHatGov/ansible-tower-samples).
+This project is tested for compatibility with the [demo.redhat.com Ansible Product Demos](https://demo.redhat.com/catalog?search=product+demos&item=babylon-catalog-prod%2Fopenshift-cnv.aap-product-demos-cnv.prod) lab environment. To use with other Ansible Automation Platform installations, review the [prerequisite documentation](https://github.com/ansible/product-demos-bootstrap).

 > NOTE: demo.redhat.com is available to Red Hat Associates and Partners with a valid account.

@@ -37,7 +39,7 @@ This project is tested for compatibility with the [demo.redhat.com Product Demos
     - Image: quay.io/acme_corp/product-demos-ee:latest
     - Pull: Only pull the image if not present before running

-3. If it is not already created for you, create a Project called `Ansible official demo project` with this repo as a source. NOTE: if you are using a fork, be sure that you have the correct URL. Update the project.
+3. If it is not already created for you, create a Project called `Ansible Product Demos` with this repo as a source. NOTE: if you are using a fork, be sure that you have the correct URL. Update the project.

 4. Finally, Create a Job Template called `Setup` with the following configuration:

@@ -57,8 +59,8 @@ This project is tested for compatibility with the [demo.redhat.com Product Demos
 Can't find what you're looking for? Customize this repo to make it your own.

 1. Create a fork of this repo.
-2. Update the URL of the `Ansible official demo project` in the Controller.
-3. Make changes as needed and run the **Setup** job
+2. Update the URL of the `Ansible Project Demos` in the Controller.
+3. Make changes as needed and run the **Product Demos | Single demo setup** job

 See the [contribution guide](CONTRIBUTING.md) for more details on how to customize the project.

--- a/ansible.cfg
+++ b/ansible.cfg
@@ -3,14 +3,18 @@ collections_path=./collections
 roles_path=./roles

 [galaxy]
-server_list = ah,galaxy
+server_list = certified,validated,galaxy

-[galaxy_server.ah]
+[galaxy_server.certified]
 # Grab a token at https://console.redhat.com/ansible/automation-hub/token
-# Then define it using ANSIBLE_GALAXY_SERVER_AH_TOKEN=""
-
+# Then define it in the ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN environment variable
 url=https://console.redhat.com/api/automation-hub/content/published/
 auth_url=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token

+[galaxy_server.validated]
+# Define the token in the ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN environment variable
+url=https://console.redhat.com/api/automation-hub/content/validated/
+auth_url=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
+
 [galaxy_server.galaxy]
 url=https://galaxy.ansible.com/
--- a/cloud/setup.yml
+++ b/cloud/setup.yml
@@ -114,7 +114,7 @@ controller_templates:
    organization: Default
    credentials:
      - AWS
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: cloud/snapshot_ec2.yml
    inventory: Demo Inventory
    notification_templates_started: Telemetry
@@ -145,7 +145,7 @@ controller_templates:
    organization: Default
    credentials:
      - AWS
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: cloud/restore_ec2.yml
    inventory: Demo Inventory
    notification_templates_started: Telemetry
@@ -176,7 +176,7 @@ controller_templates:
    organization: Default
    credentials:
      - AWS
-    project: Ansible official demo project
+    project: Ansible Product Demos
    playbook: cloud/display-ec2-stats.yml
    inventory: Demo Inventory
    notification_templates_started: Telemetry
@@ -186,7 +186,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
@@ -368,7 +368,7 @@ controller_workflows:
          default: os_linux
    simplified_workflow_nodes:
      - identifier: Project Sync
-        unified_job_template: Ansible official demo project
+        unified_job_template: Ansible Product Demos
        success_nodes:
          - Take Snapshot
      - identifier: Inventory Sync
--- a/collections/ansible_collections/demo/compliance/playbooks/playbook.yml
+++ b/collections/ansible_collections/demo/compliance/playbooks/playbook.yml
@@ -0,0 +1,7 @@
+---
+- hosts: localhost
+  gather_facts: no
+
+  tasks:
+  - debug:
+      msg: Hello world!
--- 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"
+# required collections are installed in the Product Demos EE.
+# additional collections needed during testing can be added here.
+collections: []
+
+...
--- a/common/setup.yml
+++ b/common/setup.yml
@@ -1,13 +1,11 @@
 ---
 controller_execution_environments:
-  - name: product-demos
-    image: quay.io/acme_corp/product-demos-ee:latest
  - name: Cloud Services Execution Environment
    image: quay.io/scottharwell/cloud-ee:latest

 controller_organizations:
  - name: Default
-    default_environment: product-demos
+    default_environment: Product Demos EE

 controller_projects:
  - name: Ansible Cloud Content Lab - AWS
@@ -78,7 +76,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 +101,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 +131,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
--- a/execution_environments/apd-ee-25.yml
+++ b/execution_environments/apd-ee-25.yml
@@ -5,7 +5,9 @@ images:
    name: registry.redhat.io/ansible-automation-platform-25/ee-minimal-rhel9:latest

 dependencies:
-  galaxy: requirements.yml
+  galaxy: requirements-25.yml
+  python_interpreter:
+    python_path: /usr/bin/python3.11

 additional_build_files:
  # https://access.redhat.com/solutions/7024259
@@ -20,6 +22,9 @@ options:

 additional_build_steps:
  prepend_base:
+    # AgnosticD can use this to deterine it is running from an EE
+    # see https://github.com/redhat-cop/agnosticd/blob/development/ansible/install_galaxy_roles.yml
+    - ENV LAUNCHED_BY_RUNNER=1
    - RUN $PYCMD -m pip install --upgrade pip setuptools
    - COPY _build/rpms/openshift-clients*.rpm /tmp/openshift-clients.rpm
    - RUN $PKGMGR -y update && $PKGMGR -y install bash-completion && $PKGMGR clean all
--- a/execution_environments/build.sh
+++ b/execution_environments/build.sh
@@ -3,10 +3,13 @@
 # array of images to build
 ee_images=(
    "apd-ee-24"
+    "apd-ee-25"
 )

 for ee in "${ee_images[@]}"
 do
+    echo "Building EE image ${ee}"
+
    # build EE image
    ansible-builder build \
        --file ${ee}.yml \
--- a/execution_environments/requirements-25.yml
+++ b/execution_environments/requirements-25.yml
@@ -0,0 +1,73 @@
+---
+collections:
+  # AAP config as code
+  - name: ansible.controller
+    version: ">=4.6.0"
+  # TODO this fails trying to install a different version of
+  # the python-systemd package
+  # - name: ansible.eda  # fails trying to install systemd-python package
+  #   version: ">=2.1.0"
+  - name: ansible.hub
+    version: ">=1.0.0"
+  - name: ansible.platform
+    version: ">=2.5.0"
+  - name: infra.ah_configuration
+    version: ">=2.0.6"
+  - name: infra.controller_configuration
+    version: ">=2.11.0"
+  # linux demos
+  - 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 demos
+  - name: ansible.windows
+    version: ">=2.3.0"
+  - name: chocolatey.chocolatey
+    version: ">=1.5.1"
+  - name: community.windows
+    version: ">=2.2.0"
+  # cloud demos
+  - name: amazon.aws
+    version: ">=7.5.0"
+  # satellite demos
+  - name: redhat.satellite
+    version: ">=4.0.0"
+  # network demos
+  - 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"
+  # TODO on 2.5 ee-minimal-rhel9 this tries to build and install
+  # a different version of python netifaces, which fails
+  # - name: infoblox.nios_modules
+  #   version: ">=1.6.1"
+  # openshift demos
+  - name: kubernetes.core
+    version: ">=4.0.0"
+  - name: redhat.openshift
+    version: ">=3.0.1"
+  - name: redhat.openshift_virtualization
+    version: ">=1.4.0"
+  # for RHDP
+  - name: ansible.utils
+    version: ">=5.1.0"
+  - name: kubevirt.core
+    version: ">=2.1.0"
+  - name: community.okd
+    version: ">=4.0.0"
+  - name: https://github.com/rhpds/assisted_installer.git
+    type: git
+    version: "v0.0.1"
+
+...
--- a/execution_environments/requirements.yml
+++ b/execution_environments/requirements.yml
@@ -1,7 +1,7 @@
 ---
 collections:
  - name: ansible.controller
-    version: ">=4.5.5"
+    version: "<4.6.0"
  - name: infra.ah_configuration
    version: ">=2.0.6"
  - name: infra.controller_configuration
--- a/linux/patching.yml
+++ b/linux/patching.yml
@@ -45,6 +45,16 @@
            name: firewalld
            state: started

+        - name: Enable firewall http service
+          ansible.posix.firewalld:
+            service: '{{ item }}'
+            state: enabled
+            immediate: true
+            permanent: true
+          loop:
+            - http
+            - https
+
        - name: Build report server
          ansible.builtin.include_role:
            name: "{{ item }}"
--- 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
@@ -15,3 +15,5 @@
    - name: Default Components
      ansible.builtin.include_role:
        name: "infra.controller_configuration.job_launch"
+      vars:
+        controller_dependency_check: false  # noqa: var-naming[no-role-prefix]
--- a/network/README.md
+++ b/network/README.md
@@ -76,4 +76,4 @@ A **`Demo Inventory`** is created when setting up these demos and a dynamic sour
    }
  },
  "_ansible_no_log": false
-}
+}
--- 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/README.md
+++ b/openshift/README.md
@@ -14,10 +14,6 @@ This category of demos shows examples of OpenShift operations and management wit
 - [**OpenShift / Dev Spaces**](devspaces.yml) - Install and deploy dev spaces on OCP cluster. After this job has run successfully, login to your OCP cluster, click the application icon (to the left of the bell icon in the top right) to access Dev Spaces
 - [**OpenShift / GitLab**](gitlab.yml) - Install and deploy GitLab on OCP.
 - [**OpenShift / EDA / Install Controller**](eda/install.yml) - Install and deploy EDA Controller instance using the AAP OpenShift operator.
- **OpenShift / CNV /  Deploy Automation Hub and sync EEs and Collections** - Workflow Job Template to deploy a functional Automaiton Hub instance in OCP.
-    - [**OpenShift / Hub / Install Automation Hub**](hub/install.yml) - Install and deploy Automation Hub instance using the AAP OpenShift operator.
-    - [**OpenShift / Hub / Sync EE Registries**](hub/registries.yml) - Synchronize Execution Environments from console.redhat.com.
-    - [**OpenShift / Hub / Sync Collection Repositories**](hub/collections.yml) - Synchronize collections from console.redhat.com.
 - [**OpenShift / CNV / Install Operator**](cnv/install.yml) - Install the Container Native Virtualization (CNV) operator and all its required dependencies.
 - **OpenShift / CNV / Infra Stack** - Workflow Job Template to build out infrastructure necessary to run jobs against VMs in OpenShift Virtualization.
    - [**OpenShift / CNV / Create RHEL VM**](cnv/install.yml) - Install the Container Native Virtualization (CNV) operator and all its required dependencies.
--- a/openshift/cnv/provision_rhel.yml
+++ b/openshift/cnv/provision_rhel.yml
@@ -94,3 +94,4 @@
        name: "{{ vm_name }}"
        namespace: "{{ vm_namespace }}"
        wait: true
+        wait_timeout: 240
--- a/openshift/host_vars/localhost.yml
+++ b/openshift/host_vars/localhost.yml
@@ -1,2 +1,2 @@
 ---
-gitlab_chart_version: "8.0.1"
+gitlab_chart_version: "8.5.1"
--- 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
@@ -268,6 +268,10 @@ controller_workflows:
          type: text
          variable: rh_subscription_org
          required: true
+        - question_name: Email
+          type: text
+          variable: email
+          required: true
    simplified_workflow_nodes:
      - identifier: Deploy RHEL8 VM
        unified_job_template: OpenShift / CNV / Create RHEL VM
@@ -312,7 +316,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
@@ -17,6 +17,8 @@
    - name: Create common demo resources
      ansible.builtin.include_role:
        name: infra.controller_configuration.dispatch
+      vars:
+        controller_dependency_check: false  # noqa: var-naming[no-role-prefix]

 - name: Setup demo
  hosts: localhost
@@ -28,6 +30,8 @@
    - name: Demo Components
      ansible.builtin.include_role:
        name: infra.controller_configuration.dispatch
+      vars:
+        controller_dependency_check: false  # noqa: var-naming[no-role-prefix]

    - name: Log Demo
      ansible.builtin.uri:
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -0,0 +1 @@
+../execution_environments/requirements.yml
--- 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
willtome	c86bfd0a10	add playbook	2024-11-18 21:03:20 -05:00
Matthew Fernandez	3137ce1090	Add RHDP dependencies to APD EE definition (#203 )	2024-11-18 16:18:54 -05:00
Matthew Fernandez	5581e790f6	A few small bug fixes around OCP CNV demos (#202 )	2024-11-12 08:47:39 -07:00
Chris Edillon	90d28aabbe	Resolved firewalld issue on patch report server (#200 )	2024-11-11 15:04:03 -07:00
shebistar	b523a48b23	Update chart version for gitlab to 8.5.1 (#199 )	2024-11-11 11:02:47 -05:00
Matthew Fernandez	d085007b55	Update APD EE for use with AgnosticD (#198 )	2024-11-05 11:53:57 -05:00
Matthew Fernandez	c98732009c	update common to use new default EE (#197 )	2024-10-28 14:14:27 -06:00
Chris Edillon	0f1e4828a3	apply single-demo fix to multi-demo JT (#196 )	2024-10-28 13:35:06 -04:00
Chris Edillon	fbb6d95736	added 2.5 EE to build script (#195 )	2024-10-28 13:10:31 -04:00
Chris Edillon	1e266f457a	hotfix: disable controller_configuration check see https://github.com/redhat-cop/infra.aap_configuration/issues/942	2024-10-28 12:58:31 -04:00
Chris Edillon	fd9405ef02	Switch to the new product demos EE and bootstrap repo (#194 )	2024-10-28 11:58:30 -04:00