fix JT name

.ansible-lint

@@ -10,4 +10,3 @@ exclude_paths:
   - collections/ansible_collections/demo/compliance/roles/
   - roles/redhatofficial.*
   - .github/
-  - execution_environments/ee_contexts/

.github/workflows/pre-commit.yml

@@ -5,8 +5,7 @@ on:
  - pull_request_target
 
 env:
-  ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN: ${{ secrets.ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN }}
-  ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN: ${{ secrets.ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN }}
+  ANSIBLE_GALAXY_SERVER_AH_TOKEN: ${{ secrets.ANSIBLE_GALAXY_SERVER_AH_TOKEN }}
 
 jobs:
   pre-commit:

.pre-commit-config.yaml

@@ -3,6 +3,9 @@ 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/.*$
 

.vscode/settings.json

@@ -1,4 +1,3 @@
 {
-    "editor.renderWhitespace": "all",
-    "ansible.python.interpreterPath": "/usr/local/bin/python3"
+    "editor.renderWhitespace": "all"
 }

README.md

@@ -1,18 +1,16 @@
 [![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](https://www.redhat.com/en/technologies/management/ansible).
+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.
 
 | 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) | Network automation demos |
-| [OpenShift](openshift/README.md) | OpenShift automation demos |
+| [Network](network/README.md) | Ansible Network automation demos |
 | [Satellite](satellite/README.md) | Demos of automation with Red Hat Satellite Server |
 
 ## Contributions
@@ -21,7 +19,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 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).
+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).
 
 > NOTE: demo.redhat.com is available to Red Hat Associates and Partners with a valid account.
 
@@ -39,7 +37,7 @@ This project is tested for compatibility with the [demo.redhat.com Ansible Produ
      - 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 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.
+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.
 
 4. Finally, Create a Job Template called `Setup` with the following configuration:
 
@@ -59,8 +57,8 @@ This project is tested for compatibility with the [demo.redhat.com Ansible Produ
 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 Project Demos` in the Controller.
-3. Make changes as needed and run the **Product Demos | Single demo setup** job
+2. Update the URL of the `Ansible official demo project` in the Controller.
+3. Make changes as needed and run the **Setup** job
 
 See the [contribution guide](CONTRIBUTING.md) for more details on how to customize the project.
 

ansible.cfg

@@ -3,17 +3,13 @@ collections_path=./collections
 roles_path=./roles
 
 [galaxy]
-server_list = certified,validated,galaxy
+server_list = ah,galaxy
 
-[galaxy_server.certified]
+[galaxy_server.ah]
 # Grab a token at https://console.redhat.com/ansible/automation-hub/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
+# Then define it using ANSIBLE_GALAXY_SERVER_AH_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/
+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.galaxy]

cloud/setup.yml

@@ -114,7 +114,7 @@ controller_templates:
     organization: Default
     credentials:
       - AWS
-    project: Ansible Product Demos
+    project: Ansible official demo project
     playbook: cloud/snapshot_ec2.yml
     inventory: Demo Inventory
     notification_templates_started: Telemetry
@@ -145,7 +145,7 @@ controller_templates:
     organization: Default
     credentials:
       - AWS
-    project: Ansible Product Demos
+    project: Ansible official demo project
     playbook: cloud/restore_ec2.yml
     inventory: Demo Inventory
     notification_templates_started: Telemetry
@@ -176,7 +176,7 @@ controller_templates:
     organization: Default
     credentials:
       - AWS
-    project: Ansible Product Demos
+    project: Ansible official demo project
     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 Product Demos"
+    project: "Ansible official demo project"
     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 Product Demos
+        unified_job_template: Ansible official demo project
         success_nodes:
           - Take Snapshot
       - identifier: Inventory Sync

collections/ansible_collections/demo/compliance/playbooks/playbook.yml

@@ -1,7 +0,0 @@
----
-- hosts: localhost
-  gather_facts: no
-
-  tasks:
-  - debug:
-      msg: Hello world!

collections/requirements.yml

@@ -1,6 +1,6 @@
 ---
-# required collections are installed in the Product Demos EE.
-# additional collections needed during testing can be added here.
-collections: []
-
+collections:
+  - name: infra.aap_configuration
+    type: git
+    source: https://github.com/redhat-cop/infra.aap_configuration.git
 ...

common/setup.yml

@@ -1,11 +1,13 @@
 ---
 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 EE
+    default_environment: product-demos
 
 controller_projects:
   - name: Ansible Cloud Content Lab - AWS
@@ -282,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

execution_environments/apd-ee-25.yml

@@ -5,9 +5,7 @@ images:
     name: registry.redhat.io/ansible-automation-platform-25/ee-minimal-rhel9:latest
 
 dependencies:
-  galaxy: requirements-25.yml
-  python_interpreter:
-    python_path: /usr/bin/python3.11
+  galaxy: requirements.yml
 
 additional_build_files:
   # https://access.redhat.com/solutions/7024259
@@ -22,9 +20,6 @@ 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

execution_environments/build.sh

@@ -3,13 +3,10 @@
 # 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 \

execution_environments/requirements-25.yml

@@ -1,73 +0,0 @@
----
-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"
-
-...

execution_environments/requirements.yml

@@ -1,7 +1,7 @@
 ---
 collections:
   - name: ansible.controller
-    version: "<4.6.0"
+    version: ">=4.5.5"
   - name: infra.ah_configuration
     version: ">=2.0.6"
   - name: infra.controller_configuration

linux/patching.yml

@@ -45,16 +45,6 @@
             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 }}"

multi_select_setup.yml

@@ -15,5 +15,3 @@
     - name: Default Components
       ansible.builtin.include_role:
         name: "infra.controller_configuration.job_launch"
-      vars:
-        controller_dependency_check: false  # noqa: var-naming[no-role-prefix]

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
-}
+}

openshift/README.md

@@ -14,6 +14,10 @@ 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.

openshift/cnv/provision_rhel.yml

@@ -94,4 +94,3 @@
         name: "{{ vm_name }}"
         namespace: "{{ vm_namespace }}"
         wait: true
-        wait_timeout: 240

openshift/host_vars/localhost.yml

@@ -1,2 +1,2 @@
 ---
-gitlab_chart_version: "8.5.1"
+gitlab_chart_version: "8.0.1"

openshift/setup.yml

@@ -268,10 +268,6 @@ 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

setup_demo.yml

@@ -16,9 +16,7 @@
 
     - 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: infra.aap_configuration.dispatch
 
 - name: Setup demo
   hosts: localhost
@@ -29,9 +27,7 @@
 
     - name: Demo Components
       ansible.builtin.include_role:
-        name: infra.controller_configuration.dispatch
-      vars:
-        controller_dependency_check: false  # noqa: var-naming[no-role-prefix]
+        name: infra.aap_configuration.dispatch
 
     - name: Log Demo
       ansible.builtin.uri:

tests/requirements.yml

@@ -1 +0,0 @@
-../execution_environments/requirements.yml