fix job template name

remove dynamic inventory
fix cred name
2024-08-21 02:55:59 +00:00 · 2024-08-21 02:52:55 +00:00 · 2024-08-21 02:51:34 +00:00 · 2024-08-21 02:46:35 +00:00 · 2024-08-21 02:39:19 +00:00 · 2024-08-21 01:58:55 +00:00
50 changed files with 12567 additions and 2966 deletions
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -12,6 +12,8 @@ jobs:
    name: pre-commit
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v3
-    - uses: pre-commit/action@v3.0.0
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+    - uses: pre-commit/action@v3.0.1
+
+...
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,6 @@ choose_demo_example_aws.yml
 .ansible.cfg
 *.gz
 *artifact*.json
-**/roles/*
-!**/roles/requirements.yml
+roles/*
+!roles/requirements.yml
 .deployment_id
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,10 @@ repos:
    rev: v4.4.0
    hooks:
      - id: end-of-file-fixer
+        exclude: rhel[89]STIG/.*$
+
      - id: trailing-whitespace
+        exclude: rhel[89]STIG/.*$

      - id: check-yaml
        exclude: \.j2.(yaml|yml)$|\.(yaml|yml).j2$
@@ -26,4 +29,5 @@ repos:
    rev: 23.11.0
    hooks:
      - id: black
+        exclude: rhel[89]STIG/.*$
 ...
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [v-0.0.1](https://github.com/ansible/product-demos/-/tree/v-0.0.1) - 2024-01-12
-
-### Added
-
- Initial release  ([1af584b4ea6d77812bfcb2f6474fee6ee1b13666](https://github.com/ansible/product-demos/-/commit/1af584b4ea6d77812bfcb2f6474fee6ee1b13666))
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,6 +18,7 @@ This document aims to outline the requirements for the various forms of contribu
 - PRs should be rebased against the `main` branch to avoid conflicts.
 - PRs should not impact more than a single directory/demo section.
 - PRs should not rely on external infrastructure or configuration unless the dependency is automated or specified in the `user_message` of `setup.yml`.
+- PR titles should describe the work done in the PR.  Titles should not be generic ("Added new demo") and should not refer to an issue number ("Fix for issue #123").

 ## Adding a New Demo
 1) Create a new branch based on main. (eg. `git checkout -b <branch name>`)
@@ -31,7 +32,7 @@ This document aims to outline the requirements for the various forms of contribu
   1) You can copy paste an existing one and edit it.
   2) Ensure you edit the name, playbook path, survey etc.
 5) Add any needed roles/collections to the [requirements.yml](/collections/requirements.yml)
-6) Test via [demo.redhat.com](https://demo.redhat.com/catalog?item=babylon-catalog-prod/sandboxes-gpte.aap-product-demos.prod&utm_source=webapp&utm_medium=share-link), specify your branch name within the project configuration.
+6) Test via [demo.redhat.com](https://demo.redhat.com/catalog?search=product&item=babylon-catalog-prod%2Fopenshift-cnv.aap-product-demos-cnv.prod), specifying your branch name within the project configuration.

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

@@ -43,13 +44,10 @@ This document aims to outline the requirements for the various forms of contribu
    ---
    user_message: ''

-    controller_components:
-    - job_templates
-
    controller_templates:
    ...
    ```
-   - `controller_components` can be any of the roles defined [here](https://github.com/redhat-cop/controller_configuration/tree/devel/roles)
+   - Configuration variables can be from any of the roles defined in the [infra.controller_configuration collection](https://github.com/redhat-cop/controller_configuration/tree/devel/roles)
   - Add variables for each component listed
 3) Include a README.md in the subdirectory

@@ -72,76 +70,3 @@ Copy the token value and execute the following command:
 ```bash
 export ANSIBLE_GALAXY_SERVER_AH_TOKEN=<token>
 ```
-
-## Release Process
-
-We follow a structured release process for this project. Here are the steps involved:
-
-1. **Create a Release Branch:**
-   - Start by creating a new release branch from the `main` branch.
-
-   ```bash
-   git checkout -b release/v-<version>
-   ```
-
-2. **Update Changelog:**
-   - Open the `CHANGELOG.md` file to manually add your change to the appropriate section.
-   - Our changelog follows the [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format and includes the following categories of changes:
-
-     - `Added` for new features.
-     - `Changed` for changes in existing functionality.
-     - `Deprecated` for features that will be removed in upcoming releases.
-     - `Fixed` for bug fixes.
-     - `Removed` for deprecated features that were removed.
-     - `Security` for security-related changes.
-
-   - Add a new entry under the relevant category. Include a brief summary of the change and the merge request commit tag.
-
-     ```markdown
-     ## [Unreleased]
-
-     ### Added
-
-     - New feature or enhancement ([Merge Request Commit](https://github.com/ansible/product-demos/-/commit/<commit-hash>))
-     ```
-
-   - Replace `<commit-hash>` with the actual commit hash from the merge request.
-
-3. **Commit Changes:**
-   - Commit the changes made to the `CHANGELOG.md` file.
-
-   ```bash
-   git add CHANGELOG.md
-   git commit -m "Update CHANGELOG for release <version>"
-   ```
-
-4. **Create a Pull Request:**
-   - Open a pull request from the release branch to the `main` branch.
-
-5. **Review and Merge:**
-   - Review the pull request and merge it into the `main` branch.
-
-6. **Tag the Release:**
-   - Once the pull request is merged, tag the release with the version number.
-
-   ```bash
-   git tag -a v-<version> -m "Release <version>"
-   git push origin v-<version>
-   ```
-
-7. **Publish the Release:**
-   - After the successful completion of the pull request and merging into the `main` branch, an automatic GitHub Action will be triggered to publish the release.
-
-     The GitHub Action will perform the following steps:
-     - Parse the `CHANGELOG.md` file.
-     - Generate a release note based on the changes.
-     - Attach relevant files (such as `LICENSE`, `CHANGELOG.md`, and the generated `CHANGELOG.txt`) to the GitHub Release.
-
-     No manual intervention is required for this step; the GitHub Action will handle the release process automatically.
-
-8. **Cleanup:**
-   - Delete the release branch.
-
-   ```bash
-   git branch -d release/v-<version>
-   ```
--- a/README.md
+++ b/README.md
@@ -19,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 Product Demos Sandbox]([red.ht/aap-product-demos](https://demo.redhat.com/catalog?item=babylon-catalog-prod/sandboxes-gpte.aap-product-demos.prod&utm_source=webapp&utm_medium=share-link)) 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 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.

--- a/cloud/README.md
+++ b/cloud/README.md
@@ -10,7 +10,7 @@
    - [Configure Credentials](#configure-credentials)
    - [Add Workshop Credential Password](#add-workshop-credential-password)
    - [Remove Inventory Variables](#remove-inventory-variables)
-    - [Getting your Puiblic Key for Create Keypair Job](#getting-your-puiblic-key-for-create-keypair-job)
+    - [Getting your Public Key for Create Keypair Job](#getting-your-public-key-for-create-keypair-job)
  - [Suggested Usage](#suggested-usage)
  - [Known Issues](#known-issues)

@@ -49,11 +49,11 @@ After running the setup job template, there are a few steps required to make the

 1) Remove Workshop Inventory variables on the Details page of the inventory. Required until [RFE](https://github.com/ansible/workshops/issues/1597]) is complete

-### Getting your Puiblic Key for Create Keypair Job
+### Getting your Public Key for Create Keypair Job

 1) Connect to the command line of your Controller server. This is easiest to do by opening the VS Code Web Editor from the landing page where you found the Controller login details.
 2) Open a Terminal Window in the VS Code Web Editor.
-3) SSH to one of your linux nodes (eg. `ssh node1`). This should log you into the node as `ec2-user`
+3) SSH to one of your linux nodes (eg. `ssh aws_rhel9`). This should log you into the node as `ec2-user`
 4) `cat .ssh/authorized_keys` and copy the key listed including the  `ssh-rsa` prefix


--- a/cloud/create_vpc.yml
+++ b/cloud/create_vpc.yml
@@ -122,3 +122,12 @@
          Name: "{{ aws_rt_name }}"
          owner: "{{ aws_owner_tag }}"
          purpose: "{{ aws_purpose_tag }}"
+
+    - name: Set VPC stats
+      ansible.builtin.set_stats:
+        data:
+          __aws_region: '{{ create_vm_aws_region }}'
+          __aws_vpc_id: '{{ aws_vpc.vpc.id }}'
+          __aws_vpc_cidr: '{{ aws_vpc_cidr_block }}'
+          __aws_subnet_id: '{{ aws_subnet.subnet.id }}'
+          __aws_subnet_cidr: '{{ aws_subnet_cidr }}'
--- a/cloud/setup.yml
+++ b/cloud/setup.yml
@@ -3,82 +3,6 @@ _deployment_id: "{{ lookup('file', playbook_dir + '/.deployment_id') }}"

 user_message:

-controller_execution_environments:
-  - name: Cloud Services Execution Environment
-    image: quay.io/scottharwell/cloud-ee:latest
-
-controller_projects:
-  - name: Ansible Cloud Content Lab - AWS
-    organization: Default
-    scm_type: git
-    wait: true
-    scm_url: https://github.com/ansible-content-lab/aws.infrastructure_config_demos.git
-    default_environment: Cloud Services Execution Environment
-
-controller_credentials:
-  - name: AWS
-    credential_type: Amazon Web Services
-    organization: Default
-    update_secrets: false
-    state: exists
-    inputs:
-      username: REPLACEME
-      password: REPLACEME
-
-#  - name: Azure
-#    credential_type: Microsoft Azure Resource Manager
-#    organization: Default
-#    update_secrets: false
-#    inputs:
-#      subscription: REPLACEME
-
-controller_inventory_sources:
-  - name: AWS Inventory
-    organization: Default
-    source: ec2
-    inventory: Demo Inventory
-    credential: AWS
-    overwrite: true
-    source_vars:
-      hostnames:
-        - tag:Name
-      compose:
-        ansible_host: public_ip_address
-        ansible_user: 'ec2-user'
-      groups:
-        cloud_aws: true
-        os_linux: tags.blueprint.startswith('rhel')
-      keyed_groups:
-        - key: platform
-          prefix: os
-        - key: tags.blueprint
-          prefix: blueprint
-        - key: tags.owner
-          prefix: owner
-
-#  - name: Azure Inventory
-#    organization: Default
-#    source: azure_rm
-#   inventory: Demo Inventory
-#    credential: Azure
-#    execution_environment: Ansible Engine 2.9 execution environment
-#    overwrite: true
-#    source_vars:
-#      hostnames:
-#        - tags.Name
-#        - default
-#      keyed_groups:
-#        - key: os_profile.system
-#          prefix: os
-#      conditional_groups:
-#        cloud_azure: true
-
-controller_groups:
-  - name: cloud_aws
-    inventory: Demo Inventory
-    variables:
-      ansible_user: ec2-user
-
 controller_templates:
  - name: Cloud / AWS / Create Peer Infrastructure
    job_type: run
@@ -140,140 +64,6 @@ controller_templates:
    extra_vars:
      aws_region: us-east-1

-  - name: Cloud / AWS / Create VPC
-    job_type: run
-    organization: Default
-    credentials:
-      - AWS
-    project: Ansible official demo project
-    playbook: cloud/create_vpc.yml
-    inventory: Demo Inventory
-    notification_templates_started: Telemetry
-    notification_templates_success: Telemetry
-    notification_templates_error: Telemetry
-    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
-        - question_name: Owner
-          type: text
-          variable: aws_owner_tag
-          required: true
-
-  - name: Cloud / AWS / Create VM
-    job_type: run
-    organization: Default
-    credentials:
-      - AWS
-      - Demo Credential
-    project: Ansible Cloud Content Lab - AWS
-    playbook: playbooks/create_vm.yml
-    inventory: Demo Inventory
-    notification_templates_started: Telemetry
-    notification_templates_success: Telemetry
-    notification_templates_error: Telemetry
-    survey_enabled: true
-    allow_simultaneous: 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
-        - question_name: Name
-          type: text
-          variable: create_vm_vm_name
-          required: true
-        - question_name: Owner
-          type: text
-          variable: create_vm_vm_owner
-          required: true
-        - question_name: Deployment
-          type: text
-          variable: create_vm_vm_deployment
-          required: true
-        - question_name: Environment
-          type: multiplechoice
-          variable: create_vm_vm_environment
-          required: true
-          choices:
-            - Dev
-            - QA
-            - Prod
-        - question_name: Blueprint
-          type: multiplechoice
-          variable: vm_blueprint
-          required: true
-          choices:
-            - windows_core
-            - windows_full
-            - rhel9
-            - rhel8
-            - rhel7
-            - al2023
-        - question_name: Subnet
-          type: text
-          variable: create_vm_aws_vpc_subnet_name
-          required: true
-          default: aws-test-subnet
-        - question_name: Security Group
-          type: text
-          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
-        - question_name: AWS Instance Type (defaults to blueprint value)
-          type: text
-          variable: create_vm_aws_instance_size
-          required: false
-        - question_name: AWS Image Filter (defaults to blueprint value)
-          type: text
-          variable: create_vm_aws_image_filter
-          required: false
-
-  - name: Cloud / AWS / Delete VM
-    job_type: run
-    organization: Default
-    credentials:
-      - AWS
-      - Demo Credential
-    project: Ansible Cloud Content Lab - AWS
-    playbook: playbooks/delete_inventory_vm.yml
-    inventory: Demo Inventory
-    notification_templates_started: Telemetry
-    notification_templates_success: Telemetry
-    notification_templates_error: Telemetry
-    survey_enabled: true
-    survey:
-      name: ''
-      description: ''
-      spec:
-        - question_name: Name or Pattern
-          type: text
-          variable: _hosts
-          required: true
-
  - name: Cloud / AWS / VPC Report
    job_type: run
    organization: Default
@@ -332,45 +122,6 @@ controller_templates:
            - us-west-1
            - us-west-2

-  - name: Cloud / AWS / Create Keypair
-    job_type: run
-    organization: Default
-    credentials:
-      - AWS
-    project: Ansible official demo project
-    playbook: cloud/aws_key.yml
-    inventory: Demo Inventory
-    notification_templates_started: Telemetry
-    notification_templates_success: Telemetry
-    notification_templates_error: Telemetry
-    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
-        - question_name: Keypair Name
-          type: text
-          variable: aws_key_name
-          required: true
-          default: aws-test-key
-        - question_name: Keypair Public Key
-          type: textarea
-          variable: aws_public_key
-          required: true
-        - question_name: Owner
-          type: text
-          variable: aws_keypair_owner
-          required: true
-
  - name: Cloud / AWS / Snapshot EC2
    job_type: run
    organization: Default
@@ -524,6 +275,7 @@ controller_workflows:
          - Deploy RHEL8 Blueprint
          - Deploy RHEL9 Blueprint
          - Deploy Windows Core Blueprint
+          - Deploy Report Server
      - identifier: Deploy Windows GUI Blueprint
        unified_job_template: Cloud / AWS / Create VM
        extra_data:
@@ -560,6 +312,15 @@ controller_workflows:
          - Update Inventory
        failure_nodes:
          - Ticket - Instance Failed
+      - identifier: Deploy Report Server
+        unified_job_template: Cloud / AWS / Create VM
+        extra_data:
+          create_vm_vm_name: reports
+          vm_blueprint: rhel9
+        success_nodes:
+          - Update Inventory
+        failure_nodes:
+          - Ticket - Instance Failed
      - identifier: Ticket - VPC Failed
        unified_job_template: 'SUBMIT FEEDBACK'
        extra_data:
--- a/collections/ansible_collections/demo/compliance/roles/iosxeSTIG/tasks/main.yml
+++ b/collections/ansible_collections/demo/compliance/roles/iosxeSTIG/tasks/main.yml
@@ -137,14 +137,14 @@
    - (cmd_result.stdout|join('\n')).find('ip dns server') != -1
    - iosxeSTIG_stigrule_215823_Manage
 # R-215823 CISC-ND-000470
- name : stigrule_215823_disable_identd
-  ignore_errors: "{{ ignore_all_errors }}"
-  notify: "save configuration"
-  ios_config:
-    defaults: yes
-    lines: "{{ iosxeSTIG_stigrule_215823_disable_identd_Lines }}"
-  when:
-    - iosxeSTIG_stigrule_215823_Manage
+# - name : stigrule_215823_disable_identd
+#   ignore_errors: "{{ ignore_all_errors }}"
+#   notify: "save configuration"
+#   ios_config:
+#     defaults: yes
+#     lines: "{{ iosxeSTIG_stigrule_215823_disable_identd_Lines }}"
+#   when:
+#     - iosxeSTIG_stigrule_215823_Manage
 # R-215823 CISC-ND-000470
 - name : stigrule_215823_disable_finger
  ignore_errors: "{{ ignore_all_errors }}"
@@ -378,9 +378,9 @@
 - name : stigrule_215837_host
  ignore_errors: "{{ ignore_all_errors }}"
  notify: "save configuration"
-  ios_logging:
-    dest: host
-    name: "{{ iosxeSTIG_stigrule_215837_host_Name }}"
+  ios_config:
+    lines:
+      - "logging {{ iosxeSTIG_stigrule_215837_host_Name }}"
  when: iosxeSTIG_stigrule_215837_Manage
 # R-215837 CISC-ND-001000
 # Please configure name IP address to a valid one.
@@ -397,16 +397,18 @@
 - name : stigrule_215838_ntp_server_1
  ignore_errors: "{{ ignore_all_errors }}"
  notify: "save configuration"
-  ios_ntp:
-    server: "{{ iosxeSTIG_stigrule_215838_ntp_server_1_Server }}"
+  cisco.ios.ios_config:
+    lines:
+      - "ntp server {{ iosxeSTIG_stigrule_215838_ntp_server_1_Server }}"
  when: iosxeSTIG_stigrule_215838_Manage
 # R-215838 CISC-ND-001030
 # Replace ntp servers' IP address before enabling.
 - name : stigrule_215838_ntp_server_2
  ignore_errors: "{{ ignore_all_errors }}"
  notify: "save configuration"
-  ios_ntp:
-    server: "{{ iosxeSTIG_stigrule_215838_ntp_server_2_Server }}"
+  cisco.ios.ios_config:
+    lines:
+      - "ntp server {{ iosxeSTIG_stigrule_215838_ntp_server_2_Server }}"
  when: iosxeSTIG_stigrule_215838_Manage
 # R-215840 CISC-ND-001050
 # service timestamps log datetime localtime is set in 215817.
--- a/collections/ansible_collections/demo/compliance/roles/rhel8STIG/callback_plugins/stig_xml.py
+++ b/collections/ansible_collections/demo/compliance/roles/rhel8STIG/callback_plugins/stig_xml.py
@@ -1,5 +1,4 @@
-from __future__ import absolute_import, division, print_function
-
+from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

 from ansible.plugins.callback import CallbackBase
@@ -12,82 +11,76 @@ import os
 import xml.etree.ElementTree as ET
 import xml.dom.minidom

-
 class CallbackModule(CallbackBase):
    CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = "xml"
-    CALLBACK_NAME = "stig_xml"
+    CALLBACK_TYPE = 'xml'
+    CALLBACK_NAME = 'stig_xml'

    CALLBACK_NEEDS_WHITELIST = True

    def _get_STIG_path(self):
-        cwd = os.path.abspath(".")
+        cwd = os.path.abspath('.')
        for dirpath, dirs, files in os.walk(cwd):
-            if os.path.sep + "files" in dirpath and ".xml" in files[0]:
+            if os.path.sep + 'files' in dirpath and '.xml' in files[0]:
                return os.path.join(cwd, dirpath, files[0])

    def __init__(self):
        super(CallbackModule, self).__init__()
        self.rules = {}
-        self.stig_path = os.environ.get("STIG_PATH")
-        self.XML_path = os.environ.get("XML_PATH")
+        self.stig_path = os.environ.get('STIG_PATH')
+        self.XML_path = os.environ.get('XML_PATH')
        if self.stig_path is None:
            self.stig_path = self._get_STIG_path()
-        self._display.display("Using STIG_PATH: {}".format(self.stig_path))
+        self._display.display('Using STIG_PATH: {}'.format(self.stig_path))
        if self.XML_path is None:
            self.XML_path = tempfile.mkdtemp() + "/xccdf-results.xml"
-        self._display.display("Using XML_PATH: {}".format(self.XML_path))
+        self._display.display('Using XML_PATH: {}'.format(self.XML_path))

        print("Writing: {}".format(self.XML_path))
        STIG_name = os.path.basename(self.stig_path)
-        ET.register_namespace("cdf", "http://checklists.nist.gov/xccdf/1.2")
-        self.tr = ET.Element("{http://checklists.nist.gov/xccdf/1.2}TestResult")
-        self.tr.set(
-            "id",
-            "xccdf_mil.disa.stig_testresult_scap_mil.disa_comp_{}".format(STIG_name),
-        )
+        ET.register_namespace('cdf', 'http://checklists.nist.gov/xccdf/1.2')
+        self.tr = ET.Element('{http://checklists.nist.gov/xccdf/1.2}TestResult')
+        self.tr.set('id', 'xccdf_mil.disa.stig_testresult_scap_mil.disa_comp_{}'.format(STIG_name))
        endtime = strftime("%Y-%m-%dT%H:%M:%S", gmtime())
-        self.tr.set("end-time", endtime)
-        tg = ET.SubElement(self.tr, "{http://checklists.nist.gov/xccdf/1.2}target")
+        self.tr.set('end-time', endtime)
+        tg = ET.SubElement(self.tr, '{http://checklists.nist.gov/xccdf/1.2}target')
        tg.text = platform.node()

    def _get_rev(self, nid):
-        with open(self.stig_path, "r") as f:
-            r = "SV-{}r(?P<rev>\d+)_rule".format(nid)
+        with open(self.stig_path, 'r') as f:
+            r = 'SV-{}r(?P<rev>\d+)_rule'.format(nid)
            m = re.search(r, f.read())
        if m:
-            rev = m.group("rev")
+            rev = m.group('rev')
        else:
-            rev = "0"
+            rev = '0'
        return rev

    def v2_runner_on_ok(self, result):
        name = result._task.get_name()
-        m = re.search("stigrule_(?P<id>\d+)", name)
+        m = re.search('stigrule_(?P<id>\d+)', name)
        if m:
-            nid = m.group("id")
+            nid = m.group('id')
        else:
            return
        rev = self._get_rev(nid)
        key = "{}r{}".format(nid, rev)
-        if self.rules.get(key, "Unknown") != False:
+        if self.rules.get(key, 'Unknown') != False:
            self.rules[key] = result.is_changed()

    def v2_playbook_on_stats(self, stats):
        for rule, changed in self.rules.items():
-            state = "fail" if changed else "pass"
-            rr = ET.SubElement(
-                self.tr, "{http://checklists.nist.gov/xccdf/1.2}rule-result"
-            )
-            rr.set("idref", "xccdf_mil.disa.stig_rule_SV-{}_rule".format(rule))
-            rs = ET.SubElement(rr, "{http://checklists.nist.gov/xccdf/1.2}result")
+            state = 'fail' if changed else 'pass'
+            rr = ET.SubElement(self.tr, '{http://checklists.nist.gov/xccdf/1.2}rule-result')
+            rr.set('idref', 'xccdf_mil.disa.stig_rule_SV-{}_rule'.format(rule))
+            rs = ET.SubElement(rr, '{http://checklists.nist.gov/xccdf/1.2}result')
            rs.text = state
        passing = len(self.rules) - sum(self.rules.values())
-        sc = ET.SubElement(self.tr, "{http://checklists.nist.gov/xccdf/1.2}score")
-        sc.set("maximum", str(len(self.rules)))
-        sc.set("system", "urn:xccdf:scoring:flat-unweighted")
+        sc = ET.SubElement(self.tr, '{http://checklists.nist.gov/xccdf/1.2}score')
+        sc.set('maximum', str(len(self.rules)))
+        sc.set('system', 'urn:xccdf:scoring:flat-unweighted')
        sc.text = str(passing)
-        with open(self.XML_path, "wb") as f:
+        with open(self.XML_path, 'wb') as f:
            out = ET.tostring(self.tr)
-            pretty = xml.dom.minidom.parseString(out).toprettyxml(encoding="utf-8")
+            pretty = xml.dom.minidom.parseString(out).toprettyxml(encoding='utf-8')
            f.write(pretty)
--- a/collections/ansible_collections/demo/compliance/roles/rhel8STIG/defaults/main.yml
+++ b/collections/ansible_collections/demo/compliance/roles/rhel8STIG/defaults/main.yml
@@ -142,9 +142,6 @@ rhel8STIG_stigrule_230347__etc_dconf_db_local_d_00_screensaver_Value: 'true'
 rhel8STIG_stigrule_230348_Manage: True
 rhel8STIG_stigrule_230348_ensure_tmux_is_installed_State: installed
 rhel8STIG_stigrule_230348__etc_tmux_conf_Line: 'set -g lock-command vlock'
-# R-230349 RHEL-08-020041
-rhel8STIG_stigrule_230349_Manage: True
-rhel8STIG_stigrule_230349__etc_bashrc_Line: '[ -n "$PS1" -a -z "$TMUX" ] && exec tmux'
 # R-230352 RHEL-08-020060
 rhel8STIG_stigrule_230352_Manage: True
 rhel8STIG_stigrule_230352__etc_dconf_db_local_d_00_screensaver_Value: 'uint32 900'
@@ -232,9 +229,6 @@ rhel8STIG_stigrule_230394__etc_audit_auditd_conf_Line: 'name_format = hostname'
 # R-230395 RHEL-08-030063
 rhel8STIG_stigrule_230395_Manage: True
 rhel8STIG_stigrule_230395__etc_audit_auditd_conf_Line: 'log_format = ENRICHED'
-# R-230396 RHEL-08-030070
-rhel8STIG_stigrule_230396_Manage: True
-rhel8STIG_stigrule_230396__etc_audit_auditd_conf_Line: 'log_group = root'
 # R-230398 RHEL-08-030090
 # A duplicate of 230396
 # duplicate of 230396
@@ -569,3 +563,6 @@ rhel8STIG_stigrule_244553_net_ipv4_conf_all_accept_redirects_Value: 0
 # R-244554 RHEL-08-040286
 rhel8STIG_stigrule_244554_Manage: True
 rhel8STIG_stigrule_244554__etc_sysctl_d_99_sysctl_conf_Line: 'net.core.bpf_jit_harden = 2'
+# R-256974 RHEL-08-010358
+rhel8STIG_stigrule_256974_Manage: True
+rhel8STIG_stigrule_256974_mailx_State: installed
--- a/collections/ansible_collections/demo/compliance/roles/rhel8STIG/files/U_RHEL_8_STIG_V1R13_Manual-xccdf.xml
+++ b/collections/ansible_collections/demo/compliance/roles/rhel8STIG/files/U_RHEL_8_STIG_V1R13_Manual-xccdf.xml
--- a/collections/ansible_collections/demo/compliance/roles/rhel8STIG/tasks/main.yml
+++ b/collections/ansible_collections/demo/compliance/roles/rhel8STIG/tasks/main.yml
@@ -4,7 +4,7 @@
 - name: stigrule_230225_banner
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)banner\s+'
+    regexp: '(?i)^\s*banner\s+'
    line: "{{ rhel8STIG_stigrule_230225_banner_Line }}"
  notify: ssh_restart
  when:
@@ -82,7 +82,7 @@
 - name: stigrule_230244_ClientAliveCountMax
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)ClientAliveCountMax\s+'
+    regexp: '(?i)^\s*ClientAliveCountMax\s+'
    line: "{{ rhel8STIG_stigrule_230244_ClientAliveCountMax_Line }}"
  notify: ssh_restart
  when:
@@ -249,7 +249,7 @@
 - name: stigrule_230288_StrictModes
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)StrictModes\s+'
+    regexp: '(?i)^\s*StrictModes\s+'
    line: "{{ rhel8STIG_stigrule_230288_StrictModes_Line }}"
  notify: ssh_restart
  when:
@@ -259,7 +259,7 @@
 - name: stigrule_230290_IgnoreUserKnownHosts
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)IgnoreUserKnownHosts\s+'
+    regexp: '(?i)^\s*IgnoreUserKnownHosts\s+'
    line: "{{ rhel8STIG_stigrule_230290_IgnoreUserKnownHosts_Line }}"
  notify: ssh_restart
  when:
@@ -269,7 +269,7 @@
 - name: stigrule_230291_KerberosAuthentication
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)KerberosAuthentication\s+'
+    regexp: '(?i)^\s*KerberosAuthentication\s+'
    line: "{{ rhel8STIG_stigrule_230291_KerberosAuthentication_Line }}"
  notify: ssh_restart
  when:
@@ -279,7 +279,7 @@
 - name: stigrule_230296_PermitRootLogin
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)PermitRootLogin\s+'
+    regexp: '(?i)^\s*PermitRootLogin\s+'
    line: "{{ rhel8STIG_stigrule_230296_PermitRootLogin_Line }}"
  notify: ssh_restart
  when:
@@ -395,7 +395,7 @@
 - name: stigrule_230330_PermitUserEnvironment
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)PermitUserEnvironment\s+'
+    regexp: '(?i)^\s*PermitUserEnvironment\s+'
    line: "{{ rhel8STIG_stigrule_230330_PermitUserEnvironment_Line }}"
  notify: ssh_restart
  when:
@@ -436,14 +436,6 @@
    create: yes
  when:
    - rhel8STIG_stigrule_230348_Manage
-# R-230349 RHEL-08-020041
- name: stigrule_230349__etc_bashrc
-  lineinfile:
-    path: /etc/bashrc
-    line: "{{ rhel8STIG_stigrule_230349__etc_bashrc_Line }}"
-    create: yes
-  when:
-    - rhel8STIG_stigrule_230349_Manage
 # R-230352 RHEL-08-020060
 - name: stigrule_230352__etc_dconf_db_local_d_00_screensaver
  ini_file:
@@ -602,7 +594,7 @@
 - name: stigrule_230382_PrintLastLog
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)PrintLastLog\s+'
+    regexp: '(?i)^\s*PrintLastLog\s+'
    line: "{{ rhel8STIG_stigrule_230382_PrintLastLog_Line }}"
  notify: ssh_restart
  when:
@@ -726,16 +718,6 @@
  notify: auditd_restart
  when:
    - rhel8STIG_stigrule_230395_Manage
-# R-230396 RHEL-08-030070
- name: stigrule_230396__etc_audit_auditd_conf
-  lineinfile:
-    path: /etc/audit/auditd.conf
-    regexp: '^log_group = '
-    line: "{{ rhel8STIG_stigrule_230396__etc_audit_auditd_conf_Line }}"
-    create: yes
-  notify: auditd_restart
-  when:
-    - rhel8STIG_stigrule_230396_Manage
 # R-230402 RHEL-08-030121
 - name : stigrule_230402__etc_audit_rules_d_audit_rules_e2
  lineinfile:
@@ -1348,7 +1330,7 @@
 - name: stigrule_230527_RekeyLimit
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)RekeyLimit\s+'
+    regexp: '(?i)^\s*RekeyLimit\s+'
    line: "{{ rhel8STIG_stigrule_230527_RekeyLimit_Line }}"
  notify: ssh_restart
  when:
@@ -1569,7 +1551,7 @@
 - name: stigrule_230555_X11Forwarding
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)X11Forwarding\s+'
+    regexp: '(?i)^\s*X11Forwarding\s+'
    line: "{{ rhel8STIG_stigrule_230555_X11Forwarding_Line }}"
  notify: ssh_restart
  when:
@@ -1579,7 +1561,7 @@
 - name: stigrule_230556_X11UseLocalhost
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)X11UseLocalhost\s+'
+    regexp: '(?i)^\s*X11UseLocalhost\s+'
    line: "{{ rhel8STIG_stigrule_230556_X11UseLocalhost_Line }}"
  notify: ssh_restart
  when:
@@ -1635,7 +1617,7 @@
 - name: stigrule_244525_ClientAliveInterval
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)ClientAliveInterval\s+'
+    regexp: '(?i)^\s*ClientAliveInterval\s+'
    line: "{{ rhel8STIG_stigrule_244525_ClientAliveInterval_Line }}"
  notify: ssh_restart
  when:
@@ -1651,7 +1633,7 @@
 - name: stigrule_244528_GSSAPIAuthentication
  lineinfile:
    path: /etc/ssh/sshd_config
-    regexp: '^\s*(?i)GSSAPIAuthentication\s+'
+    regexp: '(?i)^\s*GSSAPIAuthentication\s+'
    line: "{{ rhel8STIG_stigrule_244528_GSSAPIAuthentication_Line }}"
  notify: ssh_restart
  when:
@@ -1798,3 +1780,9 @@
    create: yes
  when:
    - rhel8STIG_stigrule_244554_Manage
+# R-256974 RHEL-08-010358
+- name: stigrule_256974_mailx
+  yum:
+    name: mailx
+    state: "{{ rhel8STIG_stigrule_256974_mailx_State }}"
+  when: rhel8STIG_stigrule_256974_Manage
--- a/collections/ansible_collections/demo/compliance/roles/rhel9STIG/callback_plugins/stig_xml.py
+++ b/collections/ansible_collections/demo/compliance/roles/rhel9STIG/callback_plugins/stig_xml.py
@@ -0,0 +1,86 @@
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+from ansible.plugins.callback import CallbackBase
+from time import gmtime, strftime
+import platform
+import tempfile
+import re
+import sys
+import os
+import xml.etree.ElementTree as ET
+import xml.dom.minidom
+
+class CallbackModule(CallbackBase):
+    CALLBACK_VERSION = 2.0
+    CALLBACK_TYPE = 'xml'
+    CALLBACK_NAME = 'stig_xml'
+
+    CALLBACK_NEEDS_WHITELIST = True
+
+    def _get_STIG_path(self):
+        cwd = os.path.abspath('.')
+        for dirpath, dirs, files in os.walk(cwd):
+            if os.path.sep + 'files' in dirpath and '.xml' in files[0]:
+                return os.path.join(cwd, dirpath, files[0])
+
+    def __init__(self):
+        super(CallbackModule, self).__init__()
+        self.rules = {}
+        self.stig_path = os.environ.get('STIG_PATH')
+        self.XML_path = os.environ.get('XML_PATH')
+        if self.stig_path is None:
+            self.stig_path = self._get_STIG_path()
+        self._display.display('Using STIG_PATH: {}'.format(self.stig_path))
+        if self.XML_path is None:
+            self.XML_path = tempfile.mkdtemp() + "/xccdf-results.xml"
+        self._display.display('Using XML_PATH: {}'.format(self.XML_path))
+
+        print("Writing: {}".format(self.XML_path))
+        STIG_name = os.path.basename(self.stig_path)
+        ET.register_namespace('cdf', 'http://checklists.nist.gov/xccdf/1.2')
+        self.tr = ET.Element('{http://checklists.nist.gov/xccdf/1.2}TestResult')
+        self.tr.set('id', 'xccdf_mil.disa.stig_testresult_scap_mil.disa_comp_{}'.format(STIG_name))
+        endtime = strftime("%Y-%m-%dT%H:%M:%S", gmtime())
+        self.tr.set('end-time', endtime)
+        tg = ET.SubElement(self.tr, '{http://checklists.nist.gov/xccdf/1.2}target')
+        tg.text = platform.node()
+
+    def _get_rev(self, nid):
+        with open(self.stig_path, 'r') as f:
+            r = 'SV-{}r(?P<rev>\d+)_rule'.format(nid)
+            m = re.search(r, f.read())
+        if m:
+            rev = m.group('rev')
+        else:
+            rev = '0'
+        return rev
+
+    def v2_runner_on_ok(self, result):
+        name = result._task.get_name()
+        m = re.search('stigrule_(?P<id>\d+)', name)
+        if m:
+            nid = m.group('id')
+        else:
+            return
+        rev = self._get_rev(nid)
+        key = "{}r{}".format(nid, rev)
+        if self.rules.get(key, 'Unknown') != False:
+            self.rules[key] = result.is_changed()
+
+    def v2_playbook_on_stats(self, stats):
+        for rule, changed in self.rules.items():
+            state = 'fail' if changed else 'pass'
+            rr = ET.SubElement(self.tr, '{http://checklists.nist.gov/xccdf/1.2}rule-result')
+            rr.set('idref', 'xccdf_mil.disa.stig_rule_SV-{}_rule'.format(rule))
+            rs = ET.SubElement(rr, '{http://checklists.nist.gov/xccdf/1.2}result')
+            rs.text = state
+        passing = len(self.rules) - sum(self.rules.values())
+        sc = ET.SubElement(self.tr, '{http://checklists.nist.gov/xccdf/1.2}score')
+        sc.set('maximum', str(len(self.rules)))
+        sc.set('system', 'urn:xccdf:scoring:flat-unweighted')
+        sc.text = str(passing)
+        with open(self.XML_path, 'wb') as f:
+            out = ET.tostring(self.tr)
+            pretty = xml.dom.minidom.parseString(out).toprettyxml(encoding='utf-8')
+            f.write(pretty)
--- a/collections/ansible_collections/demo/compliance/roles/rhel9STIG/defaults/main.yml
+++ b/collections/ansible_collections/demo/compliance/roles/rhel9STIG/defaults/main.yml
--- a/collections/ansible_collections/demo/compliance/roles/rhel9STIG/files/U_RHEL_9_STIG_V1R2_Manual-xccdf.xml
+++ b/collections/ansible_collections/demo/compliance/roles/rhel9STIG/files/U_RHEL_9_STIG_V1R2_Manual-xccdf.xml
--- a/collections/ansible_collections/demo/compliance/roles/rhel9STIG/handlers/main.yml
+++ b/collections/ansible_collections/demo/compliance/roles/rhel9STIG/handlers/main.yml
@@ -0,0 +1,30 @@
+- name: dconf_update
+  command: dconf update
+- name: auditd_restart
+  command: /usr/sbin/service auditd restart
+- name: ssh_restart
+  service:
+    name: sshd
+    state: restarted
+- name: rsyslog_restart
+  service:
+    name: rsyslog
+    state: restarted
+- name: sysctl_load_settings
+  command: sysctl --system
+- name: daemon_reload
+  systemd:
+    daemon_reload: true
+- name: networkmanager_reload
+  service:
+    name: NetworkManager
+    state: reloaded
+- name: logind_restart
+  service:
+    name: systemd-logind
+    state: restarted
+- name: with_faillock_enable
+  command: authselect enable-feature with-faillock
+- name: do_reboot
+  reboot:
+    pre_reboot_delay: 60
--- a/collections/ansible_collections/demo/compliance/roles/rhel9STIG/tasks/main.yml
+++ b/collections/ansible_collections/demo/compliance/roles/rhel9STIG/tasks/main.yml
--- a/collections/ansible_collections/demo/openshift/roles/eda_controller/.yamllint
+++ b/collections/ansible_collections/demo/openshift/roles/eda_controller/.yamllint
@@ -0,0 +1,13 @@
+---
+extends: default
+
+rules:
+  comments:
+    require-starting-space: false
+    min-spaces-from-content: 1
+  comments-indentation: disable
+  indentation:
+    indent-sequences: consistent
+  line-length:
+    max: 120
+    allow-non-breakable-inline-mappings: true
--- a/collections/ansible_collections/demo/openshift/roles/eda_controller/defaults/main.yml
+++ b/collections/ansible_collections/demo/openshift/roles/eda_controller/defaults/main.yml
@@ -0,0 +1,16 @@
+---
+# --------------------------------------------------------
+# Ansible Automation Platform Controller URL
+# --------------------------------------------------------
+# eda_controller_aap_controller_url: [Required]
+
+# --------------------------------------------------------
+# Workload: eda_controller
+# --------------------------------------------------------
+eda_controller_project: "aap"
+eda_controller_project_app_name: "eda-controller"
+
+# eda_controller_admin_password: "{{ common_password }}"
+
+eda_controller_cluster_rolebinding_name: eda_default
+eda_controller_cluster_rolebinding_role: cluster-admin
--- a/collections/ansible_collections/demo/openshift/roles/eda_controller/meta/main.yml
+++ b/collections/ansible_collections/demo/openshift/roles/eda_controller/meta/main.yml
@@ -0,0 +1,14 @@
+---
+galaxy_info:
+  role_name: eda_controller
+  author: Mitesh Sharma (mitsharm@redhat.com)
+  description: |
+    Installs EDA on OpenShift
+  license: GPLv3
+  min_ansible_version: "2.9"
+  platforms: []
+  galaxy_tags:
+    - eda
+    - openshift
+    - aap
+dependencies: []
--- a/collections/ansible_collections/demo/openshift/roles/eda_controller/readme.adoc
+++ b/collections/ansible_collections/demo/openshift/roles/eda_controller/readme.adoc
@@ -0,0 +1,6 @@
+== eda_controller
+
+This role installs EDA on OpenShift, mostly copied from https://github.com/redhat-cop/agnosticd/.
+
+== Dependencies
+Role: automation_controller_platform
--- a/collections/ansible_collections/demo/openshift/roles/eda_controller/tasks/main.yml
+++ b/collections/ansible_collections/demo/openshift/roles/eda_controller/tasks/main.yml
@@ -0,0 +1,54 @@
+---
+- name: Setup environment vars
+  block:
+    - name: Create secret and Install EDA
+      kubernetes.core.k8s:
+        state: present
+        definition: "{{ lookup('template', __definition) }}"
+      loop:
+        - eda_admin_secret.j2
+        - eda_controller.j2
+      loop_control:
+        loop_var: __definition
+
+    - name: Retrieve created route
+      kubernetes.core.k8s_info:
+        api_version: "route.openshift.io/v1"
+        kind: Route
+        name: "{{ eda_controller_project_app_name }}"
+        namespace: "{{ eda_controller_project }}"
+      register: r_eda_route
+      until: r_eda_route.resources[0].spec.host is defined
+      retries: 30
+      delay: 45
+
+    - name: Get eda-controller route hostname
+      ansible.builtin.set_fact:
+        eda_controller_hostname: "{{ r_eda_route.resources[0].spec.host }}"
+
+    - name: Wait for eda_controller to be running
+      ansible.builtin.uri:
+        url: https://{{ eda_controller_hostname }}/api/eda/v1/users/me/awx-tokens/
+        user: "admin"
+        password: "{{ lookup('ansible.builtin.env', 'CONTROLLER_PASSWORD') }}"
+        method: GET
+        force_basic_auth: true
+        validate_certs: false
+        body_format: json
+        status_code: 200
+      register: r_result
+      until: not r_result.failed
+      retries: 60
+      delay: 45
+
+    - name: Create Rolebinding for Rulebook Activations
+      kubernetes.core.k8s:
+        state: present
+        definition: "{{ lookup('template', 'cluster_rolebinding.j2') }}"
+
+    - name: Display EDA Controller URL
+      ansible.builtin.debug:
+        msg:
+          - "EDA Controller URL: https://{{ eda_controller_hostname }}"
+          - "EDA Controller Admin Login: admin"
+          - "EDA Controller Admin Password: <same as the Controller Admin password>"
--- a/collections/ansible_collections/demo/openshift/roles/eda_controller/templates/cluster_rolebinding.j2
+++ b/collections/ansible_collections/demo/openshift/roles/eda_controller/templates/cluster_rolebinding.j2
@@ -0,0 +1,13 @@
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ eda_controller_cluster_rolebinding_name }}
+subjects:
+  - kind: ServiceAccount
+    name: default
+    namespace: {{ eda_controller_project }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ eda_controller_cluster_rolebinding_role }}
--- a/collections/ansible_collections/demo/openshift/roles/eda_controller/templates/eda_admin_secret.j2
+++ b/collections/ansible_collections/demo/openshift/roles/eda_controller/templates/eda_admin_secret.j2
@@ -0,0 +1,15 @@
+---
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ eda_controller_project_app_name }}-admin-password
+  namespace: {{ eda_controller_project }}
+  labels:
+    app.kubernetes.io/component: eda
+    app.kubernetes.io/managed-by: eda-operator
+    app.kubernetes.io/name: {{ eda_controller_project_app_name }}
+    app.kubernetes.io/operator-version: '2.4'
+    app.kubernetes.io/part-of: {{ eda_controller_project_app_name }}
+data:
+  password: "{{ lookup('ansible.builtin.env', 'CONTROLLER_PASSWORD') | b64encode }}"
+type: Opaque
--- a/collections/ansible_collections/demo/openshift/roles/eda_controller/templates/eda_controller.j2
+++ b/collections/ansible_collections/demo/openshift/roles/eda_controller/templates/eda_controller.j2
@@ -0,0 +1,26 @@
+---
+apiVersion: eda.ansible.com/v1alpha1
+kind: EDA
+metadata:
+  name: {{ eda_controller_project_app_name }}
+  namespace: {{ eda_controller_project }}
+spec:
+  route_tls_termination_mechanism: Edge
+  ingress_type: Route
+  loadbalancer_port: 80
+  no_log: true
+  image_pull_policy: IfNotPresent
+  ui:
+    replicas: 1
+  set_self_labels: true
+  api:
+    gunicorn_workers: 2
+    replicas: 1
+  redis:
+    replicas: 1
+  admin_user: admin
+  loadbalancer_protocol: http
+  worker:
+    replicas: 3
+  automation_server_url: '{{ lookup('ansible.builtin.env', 'CONTROLLER_HOST') }}'
+  admin_password_secret: {{ eda_controller_project_app_name }}-admin-password
--- a/collections/ansible_collections/nmake/inventory/.gitignore
+++ b/collections/ansible_collections/nmake/inventory/.gitignore
@@ -1,107 +0,0 @@
-# ansible dist for migration if local
-ansible*
-
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
--- a/collections/ansible_collections/nmake/inventory/LICENSE
+++ b/collections/ansible_collections/nmake/inventory/LICENSE
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/collections/ansible_collections/nmake/inventory/README.md
+++ b/collections/ansible_collections/nmake/inventory/README.md
@@ -1,334 +0,0 @@
-# CSV based ansible inventory
-
-## Quick start
-
-1) Clone the repository
-
-2) Link the repo into the default collection path
-
-```
-mkdir -p ~/.ansible/collections/ansible_collections/nmake
-ln -s ~/projects/inventory ~/.ansible/collections/ansible_collections/nmake
-```
-
-3) Define a `nmake_inventory_csv.yaml` file:
-
-```yaml
-plugin: nmake.inventory.csv
-source: "/full/path/to/inventory.csv"
-
-# add an attribute to each host based on a conditional
-compose:
-  ansible_become: ansible_network_os == "eos"
-  ansible_python_interpreter: python
-
-# build dynamic groups based on csv columns
-keyed_groups:
-  - key: site
-    prefix: site
-  - key: ansible_network_os
-    prefix: ""
-    separator: ""
-
-# allow the csv to contain `vars:xxx` values which reference these
-vars:
-  ansible_user: "{{ lookup('env', 'ansible_user') }}"
-  ansible_password: "{{ lookup('env', 'ansible_password') }}"
-  ansible_become_pass: "{{ lookup('env', 'ansible_become_pass') }}"
-
-# add an attribute to each host if it's not in the csv
-defaults:
-  ansible_become_method: enable
-  ansible_connection: network_cli
-  ansible_python_interpreter: python
-
-
-# in case the CSV columns don't match what we need
-column_replace:
-  os: ansible_network_os
-```
-
-4) Define the CSV file:
-
-  Note:
-
-  - A value in the format of `vars:xxx` will be replaced with values from the yaml file above
-  - A column called groups should contain a space delimited list of groups the host should belong to
-  - All other columns will be added as attributes of the host in the inventory
-  - See the constructued inventory plugin for details about `compose`, `keyed_groups` and `groups`
-
-```
-host,os,ansible_user,ansible_password,ansible_become_pass,site,groups
-nxos101,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,red blue
-nxos102,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,blue yellow
-nxos103,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,red blue
-nxos104,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,blue yellow
-eos10[1:4],eos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,orange red
-vyos10[1:4],vyos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,orange red
-```
-
-5) Update the ansible.cfg file to allow the CSV inventory plugin:
-
-```ini
-[inventory]
-enable_plugins = nmake.inventory.csv
-```
-6) Check the inventory
-
-```bash
-ansible-inventory -i nmake_inventory_csv.yaml --list
-```
-
-```json
-{
-    "_meta": {
-        "hostvars": {
-            "eos101": {
-                "ansible_become": true,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "eos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "eos102": {
-                "ansible_become": true,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "eos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "eos103": {
-                "ansible_become": true,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "eos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "eos104": {
-                "ansible_become": true,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "eos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "nxos101": {
-                "ansible_become": false,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "nxos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "nxos102": {
-                "ansible_become": false,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "nxos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "nxos103": {
-                "ansible_become": false,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "nxos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "nxos104": {
-                "ansible_become": false,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "nxos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "vyos101": {
-                "ansible_become": false,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "vyos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "vyos102": {
-                "ansible_become": false,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "vyos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "vyos103": {
-                "ansible_become": false,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "vyos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            },
-            "vyos104": {
-                "ansible_become": false,
-                "ansible_become_method": "enable",
-                "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                "ansible_connection": "network_cli",
-                "ansible_network_os": "vyos",
-                "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                "ansible_python_interpreter": "python",
-                "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                "site": "my_lab"
-            }
-        }
-    },
-    "all": {
-        "children": [
-            "blue",
-            "eos",
-            "nxos",
-            "orange",
-            "red",
-            "site_my_lab",
-            "ungrouped",
-            "vyos",
-            "yellow"
-        ]
-    },
-    "blue": {
-        "hosts": [
-            "nxos101",
-            "nxos102",
-            "nxos103",
-            "nxos104"
-        ]
-    },
-    "eos": {
-        "hosts": [
-            "eos101",
-            "eos102",
-            "eos103",
-            "eos104"
-        ]
-    },
-    "nxos": {
-        "hosts": [
-            "nxos101",
-            "nxos102",
-            "nxos103",
-            "nxos104"
-        ]
-    },
-    "orange": {
-        "hosts": [
-            "eos101",
-            "eos102",
-            "eos103",
-            "eos104",
-            "vyos101",
-            "vyos102",
-            "vyos103",
-            "vyos104"
-        ]
-    },
-    "red": {
-        "hosts": [
-            "eos101",
-            "eos102",
-            "eos103",
-            "eos104",
-            "nxos101",
-            "nxos103",
-            "vyos101",
-            "vyos102",
-            "vyos103",
-            "vyos104"
-        ]
-    },
-    "site_my_lab": {
-        "hosts": [
-            "eos101",
-            "eos102",
-            "eos103",
-            "eos104",
-            "nxos101",
-            "nxos102",
-            "nxos103",
-            "nxos104",
-            "vyos101",
-            "vyos102",
-            "vyos103",
-            "vyos104"
-        ]
-    },
-    "vyos": {
-        "hosts": [
-            "vyos101",
-            "vyos102",
-            "vyos103",
-            "vyos104"
-        ]
-    },
-    "yellow": {
-        "hosts": [
-            "nxos102",
-            "nxos104"
-        ]
-    }
-}
-```
-
-7) Run ansible:
-
-```yaml
-# site.yaml
- hosts: all
-  gather_facts: False
-  tasks:
-  - name: Use the platform facts module for each
-    action: "{{ ansible_network_os }}_facts"
-    args:
-      gather_network_resources:
-      - interfaces
-  - debug:
-      msg: "{{ hostvars[inventory_hostname] }}"
-```
-
-```shell
-ansible-playbook -i nmake_inventory_csv.yaml site.yaml
-```
--- a/collections/ansible_collections/nmake/inventory/docs/gsheet.md
+++ b/collections/ansible_collections/nmake/inventory/docs/gsheet.md
@@ -1,376 +0,0 @@
-# Ansible inventory using a google sheet
-
-## Requirements
-
-```
-pip install --upgrade google-api-python-client google-auth-httplib2 google-auth-oauthlib
-```
-
-## Set-up
-
-1) Clone the repository
-
-2) Link the repo into the default collection path
-
-    ```
-    mkdir -p ~/.ansible/collections/ansible_collections/nmake
-    ln -s ~/projects/inventory ~/.ansible/collections/ansible_collections/nmake
-    ```
-
-3) Enable the Google sheets API and download the `credentials.json` file.
-
-    https://developers.google.com/sheets/api/quickstart/python
-
-4) Create the token file by running the inventory script directly from the command line
-
-    Note:
-    - Provide the full path the credentials file downloaded above
-    - Provide a path to where the token file should be created
-    - This step is optional, if not completed the token file will be created during the first use of the inventory plugin
-
-
-    ```shell
-    python /path_to_repo/inventory/plugins/inventory/gsheet.py \
-      --token /home/username/token.pickle \
-      --credentials /home/username/credentials.json
-    ```
-
-5) Build the google sheet
-
-    Note-
-
-    - Take note of the spreadsheet ID in the URL for your google sheet
-    - The inventory will be build from the first sheet only
-
-    Sample URL and sheet ID
-    ```
-    https://docs.google.com/spreadsheets/d/1iTRfuFTPidnJoplKVH4e5znlk3my/edit#gid=1310233339
-
-    The ID falls between the /d and /edit
-
-    1iTRfuFTPidnJoplKVH4e5znlk3my
-    ```
-
-    Sample Google sheet:
-    ```
-    host,os,ansible_user,ansible_password,ansible_become_pass,site,groups
-    nxos101,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,red blue
-    nxos102,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,blue yellow
-    nxos103,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,red blue
-    nxos104,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,blue yellow
-    eos10[1:4],eos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,orange red
-    vyos10[1:4],vyos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,orange red
-    ```
-
-
-6) Define a `nmake_inventory_gsheet.yaml` file:
-
-    Note:
-
-    - The credentials key should point to the credentials file downloaded above
-    - The token should point ot the token file created above
-
-    ```yaml
-    plugin: nmake.inventory.gsheet
-    credentials: /home/username/credentials.json
-    token: /home/username/token.pickle
-    sheet_id: 1iTRfuFTPidnJoplKVH4e5znlk3my
-
-
-    # add an attribute to each host based on a conditional
-    compose:
-      ansible_become: ansible_network_os == "eos"
-      ansible_python_interpreter: python
-
-    # build dynamic groups based on csv columns
-    keyed_groups:
-      - key: site
-        prefix: site
-      - key: ansible_network_os
-        prefix: ""
-        separator: ""
-
-    # allow the csv to contain `vars:xxx` values which reference these
-    vars:
-      ansible_user: "{{ lookup('env', 'ansible_user') }}"
-      ansible_password: "{{ lookup('env', 'ansible_password') }}"
-      ansible_become_pass: "{{ lookup('env', 'ansible_become_pass') }}"
-
-    # add an attribute to each host if it's not in the csv
-    defaults:
-      ansible_become_method: enable
-      ansible_connection: network_cli
-      ansible_python_interpreter: python
-
-
-    # in case the CSV columns don't match what we need
-    column_replace:
-      os: ansible_network_os
-    ```
-
-7) Update the ansible.cfg file to allow the CSV inventory plugin:
-
-    ```ini
-    [inventory]
-    enable_plugins = nmake.inventory.gsheet
-    ```
-
-8) Check the inventory
-
-    ```bash
-    ansible-inventory -i nmake_inventory_gsheet.yaml --list
-    ```
-
-    ```json
-    {
-        "_meta": {
-            "hostvars": {
-                "eos101": {
-                    "ansible_become": true,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "eos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "eos102": {
-                    "ansible_become": true,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "eos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "eos103": {
-                    "ansible_become": true,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "eos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "eos104": {
-                    "ansible_become": true,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "eos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "nxos101": {
-                    "ansible_become": false,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "nxos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "nxos102": {
-                    "ansible_become": false,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "nxos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "nxos103": {
-                    "ansible_become": false,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "nxos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "nxos104": {
-                    "ansible_become": false,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "nxos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "vyos101": {
-                    "ansible_become": false,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "vyos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "vyos102": {
-                    "ansible_become": false,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "vyos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "vyos103": {
-                    "ansible_become": false,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "vyos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                },
-                "vyos104": {
-                    "ansible_become": false,
-                    "ansible_become_method": "enable",
-                    "ansible_become_pass": "{{ lookup('env', 'ansible_become_pass') }}",
-                    "ansible_connection": "network_cli",
-                    "ansible_network_os": "vyos",
-                    "ansible_password": "{{ lookup('env', 'ansible_password') }}",
-                    "ansible_python_interpreter": "python",
-                    "ansible_user": "{{ lookup('env', 'ansible_user') }}",
-                    "site": "my_lab"
-                }
-            }
-        },
-        "all": {
-            "children": [
-                "blue",
-                "eos",
-                "nxos",
-                "orange",
-                "red",
-                "site_my_lab",
-                "ungrouped",
-                "vyos",
-                "yellow"
-            ]
-        },
-        "blue": {
-            "hosts": [
-                "nxos101",
-                "nxos102",
-                "nxos103",
-                "nxos104"
-            ]
-        },
-        "eos": {
-            "hosts": [
-                "eos101",
-                "eos102",
-                "eos103",
-                "eos104"
-            ]
-        },
-        "nxos": {
-            "hosts": [
-                "nxos101",
-                "nxos102",
-                "nxos103",
-                "nxos104"
-            ]
-        },
-        "orange": {
-            "hosts": [
-                "eos101",
-                "eos102",
-                "eos103",
-                "eos104",
-                "vyos101",
-                "vyos102",
-                "vyos103",
-                "vyos104"
-            ]
-        },
-        "red": {
-            "hosts": [
-                "eos101",
-                "eos102",
-                "eos103",
-                "eos104",
-                "nxos101",
-                "nxos103",
-                "vyos101",
-                "vyos102",
-                "vyos103",
-                "vyos104"
-            ]
-        },
-        "site_my_lab": {
-            "hosts": [
-                "eos101",
-                "eos102",
-                "eos103",
-                "eos104",
-                "nxos101",
-                "nxos102",
-                "nxos103",
-                "nxos104",
-                "vyos101",
-                "vyos102",
-                "vyos103",
-                "vyos104"
-            ]
-        },
-        "vyos": {
-            "hosts": [
-                "vyos101",
-                "vyos102",
-                "vyos103",
-                "vyos104"
-            ]
-        },
-        "yellow": {
-            "hosts": [
-                "nxos102",
-                "nxos104"
-            ]
-        }
-    }
-    ```
-
-9) Run ansible:
-
-    ```yaml
-    # site.yaml
-    - hosts: all
-      gather_facts: False
-      tasks:
-      - name: Use the platform facts module for each
-        action: "{{ ansible_network_os }}_facts"
-        args:
-          gather_network_resources:
-          - interfaces
-      - debug:
-          msg: "{{ hostvars[inventory_hostname] }}"
-    ```
-
-    ```shell
-    ansible-playbook -i nmake_inventory_gsheet.yaml site.yaml
-    ```
--- a/collections/ansible_collections/nmake/inventory/plugins/inventory/csv.py
+++ b/collections/ansible_collections/nmake/inventory/plugins/inventory/csv.py
@@ -1,145 +0,0 @@
-from ansible.plugins.inventory import (
-    BaseInventoryPlugin,
-    Constructable,
-    expand_hostname_range,
-    detect_range,
-)
-import csv
-
-
-DOCUMENTATION = """
-    name: nmake.inventory.csv
-    plugin_type: inventory
-    short_description: Use a CSV file as an inventory source
-    description:
-        - Use a CSV file as an inventory source
-    extends_documentation_fragment:
-      - constructed
-    options:
-        column_replace:
-            description: Replace a column name in the csv with an alternate name
-            type: dict
-        defaults:
-            description: Assign attributes to hosts when not in the CSV file
-            type: dict
-        plugin:
-            description: token that ensures this is a source file for the 'csv' plugin
-            required: True
-            choices: ['nmake.inventory.csv']
-        vars:
-            description: Use variables to provide CSV values
-            type: dict
-"""
-EXAMPLES = """
-# sample CSV file
-# host,os,ansible_user,ansible_password,ansible_become_pass,site,groups
-# nxos101,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,red blue
-# nxos102,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,blue yellow
-# nxos103,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,red blue
-# nxos104,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,blue yellow
-# eos10[1:4],eos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,orange red
-# vyos10[1:4],vyos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,orange red
-
-
-# nmake_inventory_csv.yaml
-
-plugin: nmake.inventory.csv
-source: "/home/user/github/test_csv_inventory/inventory.csv"
-
-# add an attribute to each host based on a conditional
-compose:
-  ansible_become: ansible_network_os == "eos"
-
-# build dynamic groups based on csv columns
-keyed_groups:
-  - key: site
-    prefix: site
-  - key: ansible_network_os
-    prefix: ""
-    separator: ""
-
-# allow the csv to contain `vars:xxx` values which reference these
-vars:
-  ansible_user: "{{ lookup('env', 'ansible_user') }}"
-  ansible_password: "{{ lookup('env', 'ansible_password') }}"
-  ansible_become_pass: "{{ lookup('env', 'ansible_become_pass') }}"
-
-# add an attribute to each host if it's not in the csv
-defaults:
-  ansible_connection: network_cli
-
-# in case the CSV columns don't match what we need
-column_replace:
-  os: ansible_network_os
- """
-
-
-class InventoryModule(BaseInventoryPlugin, Constructable):
-
-    NAME = "nmake.inventory.csv"
-
-    def verify_file(self, path):
-        """ return true/false if this is possibly a valid file for this plugin to consume """
-        valid = False
-        if super(InventoryModule, self).verify_file(path):
-            if path.endswith(
-                ("nmake_inventory_csv.yaml", "nmake_inventory_csv.yml")
-            ):
-                valid = True
-        return valid
-
-    def parse(self, inventory, loader, path, cache=True):
-        super(InventoryModule, self).parse(inventory, loader, path, cache)
-
-        config = self._read_config_data(path)
-        strict = self.get_option("strict")
-
-        input_file = csv.DictReader(open(config["source"]))
-
-        for entry in input_file:
-            hostvars = {}
-            groups = []
-
-            if detect_range(entry["host"]):
-                hosts = expand_hostname_range(entry["host"])
-            else:
-                hosts = [entry["host"]]
-
-            for host in hosts:
-                self.inventory.add_host(host)
-                for k, v in entry.items():
-                    if k not in ["host", "tags"]:
-                        if v.startswith("vars:"):
-                            varval = v.split("vars:")[1]
-                            v = config["vars"].get(varval)
-                        if k in config.get("column_replace", {}):
-                            add_key = config["column_replace"][k]
-                        else:
-                            add_key = k
-                        hostvars[add_key] = v
-                    if k == "groups":
-                        groups = v.split(" ")
-
-                for k, v in config.get("defaults", {}).items():
-                    if k not in hostvars:
-                        hostvars[k] = v
-
-                for k, v in hostvars.items():
-                    self.inventory.set_variable(host, k, v)
-
-                self._set_composite_vars(
-                    self.get_option("compose"), hostvars, host, strict=strict
-                )
-                self._add_host_to_composed_groups(
-                    self.get_option("groups"), hostvars, host, strict=strict
-                )
-                self._add_host_to_keyed_groups(
-                    self.get_option("keyed_groups"),
-                    hostvars,
-                    host,
-                    strict=strict,
-                )
-
-                for group in groups:
-                    self.inventory.add_group(group=group)
-                    self.inventory.add_host(group=group, host=host)
--- a/collections/ansible_collections/nmake/inventory/plugins/inventory/gsheet.py
+++ b/collections/ansible_collections/nmake/inventory/plugins/inventory/gsheet.py
@@ -1,235 +0,0 @@
-from ansible.plugins.inventory import (
-    BaseInventoryPlugin,
-    Constructable,
-    expand_hostname_range,
-    detect_range,
-)
-
-import pickle
-import os.path
-from ansible.errors import AnsibleError
-
-try:
-    from googleapiclient.discovery import build
-    from google_auth_oauthlib.flow import InstalledAppFlow
-    from google.auth.transport.requests import Request
-except ImportError:
-    raise AnsibleError(
-        "This inventory requires several python libraries that appear to be missing `pip install --upgrade google-api-python-client google-auth-httplib2 google-auth-oauthlib`"
-    )
-
-SCOPES = ["https://www.googleapis.com/auth/spreadsheets.readonly"]
-
-
-DOCUMENTATION = """
-    name: name.inventory.gsheet
-    plugin_type: inventory
-    short_description: Use a Google sheet as an inventory source
-    description:
-        - Use a Google sheet as an inventory source
-    extends_documentation_fragment:
-      - constructed
-    options:
-        column_replace:
-            description: Replace a column name in the csv with an alternate name
-            type: dict
-        credentials:
-            description: The full path to the credentials.json file
-            type: str
-            required: True
-        defaults:
-            description: Assign attributes to hosts when not in the CSV file
-            type: dict
-        plugin:
-            description: token that ensures this is a source file for the 'csv' plugin
-            required: True
-            choices: ['nmake.inventory.gsheet']
-        sheet_id:
-            description: The ID for the google sheet from the sheet's URL
-            required: True
-        token:
-            description: The full path to the token file
-            required: True
-            type: str
-        vars:
-            description: Use variables to provide CSV values
-            type: dict
-"""
-EXAMPLES = """
-# sample gsheet file
-# host,os,ansible_user,ansible_password,ansible_become_pass,site,groups
-# nxos101,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,red blue
-# nxos102,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,blue yellow
-# nxos103,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,red blue
-# nxos104,nxos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,blue yellow
-# eos10[1:4],eos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,orange red
-# vyos10[1:4],vyos,vars:ansible_user,vars:ansible_password,vars:ansible_become_pass,my_lab,orange red
-
-
-# nmake_inventory_gsheet.yaml
-
-plugin: nmake.inventory.gsheet
-credentials: /home/username/credentials.json
-token: /home/username/token.pickle
-sheet_id: 1iTRfuFTPidnJoplKVH4e5znlk3my
-
-# add an attribute to each host based on a conditional
-compose:
-  ansible_become: ansible_network_os == "eos"
-
-# build dynamic groups based on csv columns
-keyed_groups:
-  - key: site
-    prefix: site
-  - key: ansible_network_os
-    prefix: ""
-    separator: ""
-
-# allow the csv to contain `vars:xxx` values which reference these
-vars:
-  ansible_user: "{{ lookup('env', 'ansible_user') }}"
-  ansible_password: "{{ lookup('env', 'ansible_password') }}"
-  ansible_become_pass: "{{ lookup('env', 'ansible_become_pass') }}"
-
-# add an attribute to each host if it's not in the csv
-defaults:
-  ansible_connection: network_cli
-
-# in case the CSV columns don't match what we need
-column_replace:
-  os: ansible_network_os
- """
-
-
-def get_creds(token_path, cred_path):
-    creds = None
-
-    if os.path.exists(token_path):
-        with open(token_path, "rb") as token:
-            creds = pickle.load(token)
-    # If there are no (valid) credentials available, let the user log in.
-    if not creds or not creds.valid:
-        if creds and creds.expired and creds.refresh_token:
-            creds.refresh(Request())
-        else:
-            flow = InstalledAppFlow.from_client_secrets_file(cred_path, SCOPES)
-            creds = flow.run_local_server(port=0)
-        # Save the credentials for the next run
-        with open(token_path, "wb") as token:
-            pickle.dump(creds, token)
-    return creds
-
-
-def main():
-    import argparse
-
-    parser = argparse.ArgumentParser(
-        description="Ansible Google sheet inventory"
-    )
-    parser.add_argument("--token", type=str, help="Full path for token file")
-    parser.add_argument(
-        "--credentials", type=str, help="Full path to credentials.json"
-    )
-    args = parser.parse_args()
-    creds = get_creds(args.token, args.credentials)
-    if creds:
-        print("{} created successfully".format(args.token))
-
-
-class InventoryModule(BaseInventoryPlugin, Constructable):
-
-    NAME = "nmake.inventory.gsheet"
-
-    def verify_file(self, path):
-        """ return true/false if this is possibly a valid file for this plugin to consume """
-        valid = False
-        if super(InventoryModule, self).verify_file(path):
-            if path.endswith(
-                ("nmake_inventory_gsheet.yaml", "nmake_inventory_gsheet.yml")
-            ):
-                valid = True
-        return valid
-
-    def parse(self, inventory, loader, path, cache=True):
-        super(InventoryModule, self).parse(inventory, loader, path, cache)
-
-        config = self._read_config_data(path)
-        cred_path = self.get_option("credentials")
-        sheet_id = self.get_option("sheet_id")
-        token = self.get_option("token")
-
-        creds = get_creds(token, cred_path)
-
-        service = build("sheets", "v4", credentials=creds)
-
-        sheet = service.spreadsheets()
-        sheet_metadata = (
-            service.spreadsheets().get(spreadsheetId=sheet_id).execute()
-        )
-        properties = sheet_metadata.get("sheets")
-        rows = properties[0]["properties"]["gridProperties"]["rowCount"]
-        columns = properties[0]["properties"]["gridProperties"]["columnCount"]
-        range_name = "R1C1:R{}C{}".format(rows, columns)
-
-        result = (
-            sheet.values()
-            .get(spreadsheetId=sheet_id, range=range_name)
-            .execute()
-        )
-        values = result.get("values", [])
-        dicts = [dict(zip(values[0], row)) for row in values[1:]]
-        self.add_to_inventory(dicts, config)
-
-    def add_to_inventory(self, list_of_dicts, config):
-        strict = self.get_option("strict")
-        for entry in list_of_dicts:
-            hostvars = {}
-            groups = []
-
-            if detect_range(entry["host"]):
-                hosts = expand_hostname_range(entry["host"])
-            else:
-                hosts = [entry["host"]]
-
-            for host in hosts:
-                self.inventory.add_host(host)
-                for k, v in entry.items():
-                    if k not in ["host", "tags"]:
-                        if v.startswith("vars:"):
-                            varval = v.split("vars:")[1]
-                            v = config["vars"].get(varval)
-                        if k in config.get("column_replace", {}):
-                            add_key = config["column_replace"][k]
-                        else:
-                            add_key = k
-                        hostvars[add_key] = v
-                    if k == "groups":
-                        groups = v.split(" ")
-
-                for k, v in config.get("defaults", {}).items():
-                    if k not in hostvars:
-                        hostvars[k] = v
-
-                for k, v in hostvars.items():
-                    self.inventory.set_variable(host, k, v)
-
-                self._set_composite_vars(
-                    self.get_option("compose"), hostvars, host, strict=strict
-                )
-                self._add_host_to_composed_groups(
-                    self.get_option("groups"), hostvars, host, strict=strict
-                )
-                self._add_host_to_keyed_groups(
-                    self.get_option("keyed_groups"),
-                    hostvars,
-                    host,
-                    strict=strict,
-                )
-
-                for group in groups:
-                    self.inventory.add_group(group=group)
-                    self.inventory.add_host(group=group, host=host)
-
-
-if __name__ == "__main__":
-    main()
--- a/common/README.md
+++ b/common/README.md
@@ -0,0 +1,3 @@
+# Common Prerequisites
+
+Demos from some categories (cloud, linux, windows, etc.) have become dependent on controller resources defined in other demo categories.  The setup.yml file in this directory is used to configure these common prerequisites so that they are available before setup for a demo category is called.
--- a/common/setup.yml
+++ b/common/setup.yml
@@ -0,0 +1,283 @@
+---
+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
+
+controller_projects:
+  - name: Ansible Cloud Content Lab - AWS
+    organization: Default
+    scm_type: git
+    wait: true
+    scm_url: https://github.com/ansible-content-lab/aws.infrastructure_config_demos.git
+    default_environment: Cloud Services Execution Environment
+
+controller_credentials:
+  - name: AWS
+    credential_type: Amazon Web Services
+    organization: Default
+    update_secrets: false
+    state: exists
+    inputs:
+      username: REPLACEME
+      password: REPLACEME
+
+controller_inventory_sources:
+  - name: AWS Inventory
+    organization: Default
+    source: ec2
+    inventory: Demo Inventory
+    credential: AWS
+    overwrite: true
+    source_vars:
+      hostnames:
+        - tag:Name
+      compose:
+        ansible_host: public_ip_address
+        ansible_user: 'ec2-user'
+      groups:
+        cloud_aws: true
+        os_linux: tags.blueprint.startswith('rhel')
+        os_windows: tags.blueprint.startswith('win')
+      keyed_groups:
+        - key: platform
+          prefix: os
+        - key: tags.blueprint
+          prefix: blueprint
+        - key: tags.owner
+          prefix: owner
+        - key: tags.purpose
+          prefix: purpose
+        - key: tags.deployment
+          prefix: deployment
+
+controller_groups:
+  - name: cloud_aws
+    inventory: Demo Inventory
+    variables:
+      ansible_user: ec2-user
+  - name: os_windows
+    inventory: Demo Inventory
+    variables:
+      ansible_connection: winrm
+      ansible_winrm_transport: credssp
+
+controller_templates:
+  - name: SUBMIT FEEDBACK
+    job_type: run
+    inventory: Demo Inventory
+    project: Ansible official demo project
+    playbook: feedback.yml
+    execution_environment: Default execution environment
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    survey_enabled: true
+    survey:
+      name: ''
+      description: ''
+      spec:
+        - question_name: Name/Email/Contact
+          type: text
+          variable: email
+          required: true
+        - question_name: Issue or Feedback
+          type: textarea
+          variable: feedback
+          required: true
+
+  - name: Cloud / AWS / Create VPC
+    job_type: run
+    organization: Default
+    credentials:
+      - AWS
+    project: Ansible official demo project
+    playbook: cloud/create_vpc.yml
+    inventory: Demo Inventory
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    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
+        - question_name: Owner
+          type: text
+          variable: aws_owner_tag
+          required: true
+
+  - name: Cloud / AWS / Create Keypair
+    job_type: run
+    organization: Default
+    credentials:
+      - AWS
+    project: Ansible official demo project
+    playbook: cloud/aws_key.yml
+    inventory: Demo Inventory
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    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
+        - question_name: Keypair Name
+          type: text
+          variable: aws_key_name
+          required: true
+          default: aws-test-key
+        - question_name: Keypair Public Key
+          type: textarea
+          variable: aws_public_key
+          required: true
+        - question_name: Owner
+          type: text
+          variable: aws_keypair_owner
+          required: true
+
+  - name: Cloud / AWS / Create VM
+    job_type: run
+    organization: Default
+    credentials:
+      - AWS
+      - Demo Credential
+    project: Ansible Cloud Content Lab - AWS
+    playbook: playbooks/create_vm.yml
+    inventory: Demo Inventory
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    survey_enabled: true
+    allow_simultaneous: 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
+        - question_name: Name
+          type: text
+          variable: create_vm_vm_name
+          required: true
+        - question_name: Owner
+          type: text
+          variable: create_vm_vm_owner
+          required: true
+        - question_name: Deployment
+          type: text
+          variable: create_vm_vm_deployment
+          required: true
+        - question_name: Purpose
+          type: text
+          variable: create_vm_vm_purpose
+          required: true
+          default: demo
+        - question_name: Environment
+          type: multiplechoice
+          variable: create_vm_vm_environment
+          required: true
+          choices:
+            - Dev
+            - QA
+            - Prod
+        - question_name: Blueprint
+          type: multiplechoice
+          variable: vm_blueprint
+          required: true
+          choices:
+            - windows_core
+            - windows_full
+            - rhel9
+            - rhel8
+            - rhel7
+            - al2023
+        - question_name: Subnet
+          type: text
+          variable: create_vm_aws_vpc_subnet_name
+          required: true
+          default: aws-test-subnet
+        - question_name: Security Group
+          type: text
+          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
+        - question_name: AWS Instance Type (defaults to blueprint value)
+          type: text
+          variable: create_vm_aws_instance_size
+          required: false
+        - question_name: AWS Image Filter (defaults to blueprint value)
+          type: text
+          variable: create_vm_aws_image_filter
+          required: false
+
+  - name: Cloud / AWS / Delete VM
+    job_type: run
+    organization: Default
+    credentials:
+      - AWS
+      - Demo Credential
+    project: Ansible Cloud Content Lab - AWS
+    playbook: playbooks/delete_inventory_vm.yml
+    inventory: Demo Inventory
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    survey_enabled: true
+    survey:
+      name: ''
+      description: ''
+      spec:
+        - question_name: Name or Pattern
+          type: text
+          variable: _hosts
+          required: true
+
+controller_notifications:
+  - name: Telemetry
+    organization: Default
+    notification_type: webhook
+    notification_configuration:
+      url: https://script.google.com/macros/s/AKfycbzxUObvCJ6ZbzfJyicw4RvxlGE3AZdrK4AR5-TsedCYd7O-rtTOVjvsRvqyb3rx6B0g8g/exec
+      http_method: POST
+      headers: {}
+
+controller_settings:
+  - name: SESSION_COOKIE_AGE
+    value: 180000
--- a/devices.csv
+++ b/devices.csv
@@ -1,7 +0,0 @@
-host,os,site,groups
-nxos101,nxos,my_lab,red blue
-nxos102,nxos,my_lab,blue yellow
-nxos103,nxos,my_lab,red blue
-nxos104,nxos,my_lab,blue yellow
-eos10[1:4],eos,my_lab,orange red
-vyos10[1:4],vyos,my_lab,orange red
--- a/linux/README.md
+++ b/linux/README.md
@@ -60,7 +60,7 @@ Edit the `Linux / System Roles` job to include the list of roles that you wish t

 **Linux / Temporary Sudo** - Use this job to show how to grant sudo access with automated cleanup to a server. The user must exist on the system. Using the student user is a good example (ie. student1)

-**Linux / Patching** - Use this job to apply updates or audit for missing updates and produce an html report of systems with missing updates. See the end of the job for the URL to view the report. In other environments this report could be uploaded to a wiki, email, other system. This demo also shows installing a webserver on a linux server. The report is places on the system defined by the `report_server` variable. By default, `report_server` is configured as `node1`. This may be overridden with `extra_vars` on the Job Template.
+**Linux / Patching** - Use this job to apply updates or audit for missing updates and produce an html report of systems with missing updates. See the end of the job for the URL to view the report. In other environments this report could be uploaded to a wiki, email, other system. This demo also shows installing a webserver on a linux server. The report is places on the system defined by the `report_server` variable. By default, `report_server` is configured as `reports`. This may be overridden with `extra_vars` on the Job Template.

 **Linux / Run Shell Script** - Use this job to demonstrate running shell commands or an existing shell script across a group of systems as root. This can be preferred over using Ad-Hoc commands due to the ability to control usage with RBAC. This is helpful in showing the scalable of execution of an existing shell script. It is always recommended to convert shell scripts to playbooks over time. Example usage would be getting the public key used in the environment with the command `cat .ssh/authorized_keys`.

--- a/linux/compliance-enforce.yml
+++ b/linux/compliance-enforce.yml
@@ -12,5 +12,5 @@

    - name: Run Compliance Profile
      ansible.builtin.include_role:
-        name: "redhatofficial.rhel{{ ansible_distribution_major_version }}_{{ compliance_profile }}"
+        name: "redhatofficial.rhel{{ ansible_distribution_major_version }}-{{ compliance_profile }}"
 ...
--- a/linux/patching.yml
+++ b/linux/patching.yml
@@ -3,7 +3,7 @@
  hosts: "{{ _hosts | default(omit) }}"
  become: true
  vars:
-    report_server: node1
+    report_server: reports

  tasks:
    # Install yum-utils if it's not there
--- a/linux/setup.yml
+++ b/linux/setup.yml
@@ -377,6 +377,9 @@ controller_templates:
      # used by the CJIS profile role
      service_firewalld_enabled: false
      firewalld_sshd_port_enabled: false
+      # used by the PCI-DSS profile role
+      firewalld_loopback_traffic_restricted: false
+      firewalld_loopback_traffic_trusted: false
    survey_enabled: true
    survey:
      name: ''
@@ -396,7 +399,7 @@ controller_templates:
            - cui
            - hipaa
            - ospp
-            - pci_dss
+            - pci-dss
            - stig

  - name: "LINUX / Multi-profile Compliance Report"
--- a/network/report.yml
+++ b/network/report.yml
@@ -35,7 +35,7 @@
  hosts: "{{ report_server }}"
  become: true
  vars:
-    report_server: node1
+    report_server: reports
    web_path: /var/www/html/reports/

  tasks:
--- a/nmake_inventory_csv.yaml
+++ b/nmake_inventory_csv.yaml
@@ -1,12 +0,0 @@
---
-plugin: nmake.inventory.csv
-source: devices.csv
-
-keyed_groups:
-  - key: site
-    prefix: site
-  - key: ansible_network_os
-    prefix: group
-
-column_replace:
-  os: ansible_network_os
--- a/openshift/eda/install.yml
+++ b/openshift/eda/install.yml
@@ -0,0 +1,8 @@
+---
+- name: Deploy EDA Controller attached to the same AAP
+  hosts: localhost
+  gather_facts: false
+  tasks:
+    - name: Include role
+      ansible.builtin.include_role:
+        name: demo.openshift.eda_controller
--- a/openshift/inventory.kubevirt.yml
+++ b/openshift/inventory.kubevirt.yml
@@ -5,19 +5,19 @@ connections:
  - namespaces:
      - openshift-cnv
 compose:
-  ansible_user: "'cloud-user' if 'rhel' in annotations['vm.kubevirt.io/os']"
-  annotations: "annotations | ansible.utils.replace_keys(target=[
+  ansible_user: "'cloud-user' if 'rhel' in vmi_annotations['vm.kubevirt.io/os']"
+  vmi_annotations: "vmi_annotations | ansible.utils.replace_keys(target=[
                {'before':'vm.kubevirt.io/os', 'after':'os'},
                {'before':'vm.kubevirt.io/flavor', 'after':'flavor'},
                {'before':'vm.kubevirt.io/workload', 'after':'workload'},
                {'before':'kubevirt.io/vm-generation', 'after':'vm-generation'},
                {'before':'kubevirt.io/latest-observed-api-version', 'after':'latest-observed-api-version'},
                {'before':'kubevirt.io/storage-observed-api-version', 'after':'storage-observed-api-version' }] )"
-  labels: "labels | ansible.utils.replace_keys(target=[
+  labels: "vmi_labels | ansible.utils.replace_keys(target=[
                {'before':'kubevirt.io/nodeName', 'after':'nodeName'},
                {'before':'kubevirt.io/size', 'after':'size'},
                {'before':'kubevirt.io/domain', 'after':'domain' }] )"
 keyed_groups:
-  - key: annotations.os
+  - key: vmi_annotations.os
    prefix: "cnv"
    separator: "_"
--- a/openshift/setup.yml
+++ b/openshift/setup.yml
@@ -7,29 +7,6 @@ controller_components:
  - job_templates
  - workflow_job_templates

-controller_credential_types:
-  # Ideally, we would not need to use this and could just re-use the OCP credential for the inventory plugin
-  - name: OCPV inventory credential
-    kind: cloud
-    inputs:
-      fields:
-        - id: host
-          type: string
-          label: OpenShift or Kubernetes API Endpoint
-          secret: false
-        - id: bearer_token
-          type: string
-          label: API authentication bearer token
-          secret: true
-        - id: verify_ssl
-          type: boolean
-          label: Verify SSL
-    injectors:
-      env:
-        K8S_AUTH_HOST: "{% raw %}{  { host  }}{% endraw %}"
-        K8S_AUTH_API_KEY: "{% raw %}{  { bearer_token  }}{% endraw %}"
-        K8S_AUTH_VERIFY_SSL: "{% raw %}{  { verify_ssl  }}{% endraw %}"
-
 controller_credentials:
  - name: OpenShift Credential
    organization: Default
@@ -40,26 +17,30 @@ controller_credentials:
      bearer_token: CHANGEME
      verify_ssl: false

-  - name: OCP-V Inventory Credential
-    organization: Default
-    credential_type: OCPV inventory credential
-    state: exists
-    inputs:
-      host: CHANGEME
-      bearer_token: CHANGEME
-      verify_ssl: false
-
 controller_inventory_sources:
  - name: OpenShift CNV Inventory
    inventory: Demo Inventory
    source: scm
    source_project: Ansible official demo project
    source_path: openshift/inventory.kubevirt.yml
-    credential: OCP-V Inventory Credential
-    update_on_launch: true
+    credential: OpenShift Credential
+    update_on_launch: false

 controller_templates:
-  - name: OpenShift / CNV / Install
+  - name: OpenShift / EDA / Install Controller
+    job_type: run
+    inventory: "Demo Inventory"
+    project: "Ansible official demo project"
+    playbook: "openshift/eda/install.yml"
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    survey_enabled: true
+    credentials:
+      - "OpenShift Credential"
+      - "Controller Credential"
+
+  - name: OpenShift / CNV / Install Operator
    job_type: run
    inventory: "Demo Inventory"
    project: "Ansible official demo project"
@@ -125,7 +106,7 @@ controller_templates:
    notification_templates_error: Telemetry
    survey_enabled: true
    extra_vars:
-      state: absent
+      instance_state: absent
    survey:
      name: ''
      description: ''
--- a/roles/requirements.yml
+++ b/roles/requirements.yml
@@ -1,46 +1,46 @@
 ---
 roles:
  # RHEL 7 compliance roles from ComplianceAsCode
-  - name: redhatofficial.rhel7_cis
-    version: 0.1.69
-  - name: redhatofficial.rhel7_cjis
-    version: 0.1.69
-  - name: redhatofficial.rhel7_cui
-    version: 0.1.67
-  - name: redhatofficial.rhel7_hipaa
-    version: 0.1.69
-  - name: redhatofficial.rhel7_ospp
-    version: 0.1.69
-  - name: redhatofficial.rhel7_pci_dss
-    version: 0.1.69
-  - name: redhatofficial.rhel7_stig
-    version: 0.1.69
+  - name: redhatofficial.rhel7-cis
+    version: 0.1.72
+  - name: redhatofficial.rhel7-cjis
+    version: 0.1.72
+  - name: redhatofficial.rhel7-cui
+    version: 0.1.72
+  - name: redhatofficial.rhel7-hipaa
+    version: 0.1.72
+  - name: redhatofficial.rhel7-ospp
+    version: 0.1.72
+  - name: redhatofficial.rhel7-pci-dss
+    version: 0.1.72
+  - name: redhatofficial.rhel7-stig
+    version: 0.1.72
  # RHEL 8 compliance roles from ComplianceAsCode
-  - name: redhatofficial.rhel8_cis
-    version: 0.1.69
-  - name: redhatofficial.rhel8_cjis
-    version: 0.1.69
-  - name: redhatofficial.rhel8_cui
-    version: 0.1.69
-  - name: redhatofficial.rhel8_hipaa
-    version: 0.1.69
-  - name: redhatofficial.rhel8_ospp
-    version: 0.1.69
-  - name: redhatofficial.rhel8_pci_dss
-    version: 0.1.69
-  - name: redhatofficial.rhel8_stig
-    version: 0.1.69
+  - name: redhatofficial.rhel8-cis
+    version: 0.1.72
+  - name: redhatofficial.rhel8-cjis
+    version: 0.1.72
+  - name: redhatofficial.rhel8-cui
+    version: 0.1.72
+  - name: redhatofficial.rhel8-hipaa
+    version: 0.1.72
+  - name: redhatofficial.rhel8-ospp
+    version: 0.1.72
+  - name: redhatofficial.rhel8-pci-dss
+    version: 0.1.72
+  - name: redhatofficial.rhel8-stig
+    version: 0.1.72
  # RHEL 9 compliance roles from ComplianceAsCode
-  - name: redhatofficial.rhel9_cis
-    version: 0.1.68
-  - name: redhatofficial.rhel9_cui
-    version: 0.1.64
-  - name: redhatofficial.rhel9_hipaa
-    version: 0.1.68
-  - name: redhatofficial.rhel9_ospp
-    version: 0.1.68
-  - name: redhatofficial.rhel9_pci_dss
-    version: 0.1.68
-  - name: redhatofficial.rhel9_stig
-    version: 0.1.64
+  - name: redhatofficial.rhel9-cis
+    version: 0.1.72
+  - name: redhatofficial.rhel9-cui
+    version: 0.1.72
+  - name: redhatofficial.rhel9-hipaa
+    version: 0.1.72
+  - name: redhatofficial.rhel9-ospp
+    version: 0.1.72
+  - name: redhatofficial.rhel9-pci-dss
+    version: 0.1.72
+  - name: redhatofficial.rhel9-stig
+    version: 0.1.72
 ...
--- a/setup_demo.yml
+++ b/setup_demo.yml
@@ -1,63 +1,33 @@
 ---
- name: Setup demo
+- name: Setup common prerequisites
  hosts: localhost
  gather_facts: false
-  tasks:
-    - name: Default Components
-      ansible.builtin.include_role:
-        name: infra.controller_configuration.dispatch
-      vars:  # noqa var-naming[no-role-prefix]
-        controller_execution_environments:
-          - name: product-demos
-            image: quay.io/acme_corp/product-demos-ee:latest
-        controller_organizations:
-          - name: Default
-            default_environment: product-demos
-        controller_notifications:
-          - name: Telemetry
-            organization: Default
-            notification_type: webhook
-            notification_configuration:
-              url: https://script.google.com/macros/s/AKfycbzxUObvCJ6ZbzfJyicw4RvxlGE3AZdrK4AR5-TsedCYd7O-rtTOVjvsRvqyb3rx6B0g8g/exec
-              http_method: POST
-              headers: {}
-        controller_templates:
-          - name: "SUBMIT FEEDBACK"
-            job_type: run
-            inventory: "Demo Inventory"
-            project: "Ansible official demo project"
-            playbook: "feedback.yml"
-            execution_environment: Default execution environment
-            notification_templates_started: Telemetry
-            notification_templates_success: Telemetry
-            notification_templates_error: Telemetry
-            survey_enabled: true
-            survey:
-              name: ''
-              description: ''
-              spec:
-                - question_name: Name/Email/Contact
-                  type: text
-                  variable: email
-                  required: true
-                - question_name: Issue or Feedback
-                  type: textarea
-                  variable: feedback
-                  required: true
-        controller_settings:
-          - name: "SESSION_COOKIE_AGE"
-            value: 180000

+  # vars_files should be scoped to a play so variables defined in the
+  # files should not be available in subsequent plays, so certain
+  # resources won't be retried
+  vars_files:
+    - common/setup.yml
+
+  tasks:
    - name: Create reusable deployment ID
      ansible.builtin.set_fact:
        _deployment_id: '{{ lookup("ansible.builtin.password", "{{ playbook_dir }}/.deployment_id", chars=["ascii_lowercase", "digits"], length=5) }}'

-    - name: "Include configuration for {{ demo }}"
+    - name: Create common demo resources
+      ansible.builtin.include_role:
+        name: infra.controller_configuration.dispatch
+
+- name: Setup demo
+  hosts: localhost
+  gather_facts: false
+  tasks:
+    - name: Include configuration for {{ demo }}
      ansible.builtin.include_vars: "{{ demo }}/setup.yml"

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

    - name: Log Demo
      ansible.builtin.uri:
@@ -70,3 +40,5 @@
      ansible.builtin.debug:
        msg: "{{ user_message }}"
      when: user_message is defined
+
+...
--- a/windows/patching.yml
+++ b/windows/patching.yml
@@ -2,7 +2,7 @@
 - name: Windows updates
  hosts: "{{ _hosts | default('os_windows') }}"
  vars:
-    report_server: win1
+    report_server: aws_win1

  tasks:
    - name: Patch windows server
--- a/windows/setup.yml
+++ b/windows/setup.yml
@@ -7,6 +7,20 @@ controller_projects:
    organization: Default
    scm_type: git
    scm_url: 'https://github.com/ansible/awx-facts-playbooks.git'
+  - name: ansible-windows-0-day-bsod-recovery-fix
+    organization: Default
+    scm_type: git
+    scm_url: https://github.com/oatakan/ansible-windows-0-day-bsod-recovery.git
+    scm_branch: main
+  - name: aap-openshift-inventory-source
+    organization: Default
+    scm_type: git
+    scm_url: https://github.com/oatakan/ansible-openshift-virtualization-inventory-source.git
+    scm_branch: main
+
+controller_execution_environments:
+  - name: ansible-base-ee-dev
+    image: quay.io/oatakan/ansible-base-ee-dev:latest

 controller_templates:
  - name: "WINDOWS / Install IIS"
@@ -306,3 +320,135 @@ controller_templates:
          type: text
          variable: HOSTS
          required: false
+
+  - name: WINDOWS / BSOD / Provision Infrastructure
+    description: Provisions the required infrastructure
+    organization: Default
+    project: ansible-windows-0-day-bsod-recovery-fix
+    playbook: provision_infra_multi.yml
+    inventory: Demo Inventory
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    extra_vars:
+      provider: kubevirt
+      scenario: winpe
+      infra_template_name: windows-2022-standard
+    execution_environment: ansible-base-ee-dev
+    ask_credential_on_launch: true
+    ask_variables_on_launch: true
+
+  - name: WINDOWS / BSOD / Remove Infrastructure
+    description: Removes the provisioned systems
+    organization: Default
+    project: ansible-windows-0-day-bsod-recovery-fix
+    playbook: remove_infra_multi.yml
+    inventory: Demo Inventory
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    extra_vars:
+      provider: kubevirt
+      scenario: winpe
+    execution_environment: ansible-base-ee-dev
+    ask_credential_on_launch: true
+    ask_inventory_on_launch: true
+    ask_limit_on_launch: true
+    ask_variables_on_launch: true
+
+  - name: WINDOWS / BSOD / Generate WinPE
+    description: Generates WinPE image on the provisioned Windows system
+    organization: Default
+    project: ansible-windows-0-day-bsod-recovery-fix
+    playbook: generate_winpe.yml
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    extra_vars:
+      create_winpe_destination_file_location: iso_upload
+      create_winpe_enable_autostart: true
+      create_winpe_enable_powershell_modules: false
+      create_winpe_enable_script_debug: false
+      create_winpe_load_drivers: false
+    execution_environment: ansible-base-ee-dev
+    ask_credential_on_launch: true
+    ask_inventory_on_launch: true
+    ask_limit_on_launch: true
+    ask_variables_on_launch: true
+
+  - name: WINDOWS / BSOD / Upload WinPE ISO
+    description: Uploads the generated WinPE ISO to VMware/OpenShift Virtualization
+    organization: Default
+    project: ansible-windows-0-day-bsod-recovery-fix
+    playbook: upload_winpe_iso.yml
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    extra_vars:
+      provider: vmware
+    execution_environment: ansible-base-ee-dev
+    ask_credential_on_launch: true
+    ask_inventory_on_launch: true
+    ask_limit_on_launch: true
+    ask_variables_on_launch: true
+
+controller_workflows:
+  - name: WINDOWS / BSOD / Generate WinPE Image Scenario
+    description: >
+      This workflow provisions a Windows system, generates a WinPE image,
+      uploads it to OpenShift Virtualization, and then removes the provisioned VM.
+      It demonstrates the process of creating and deploying a WinPE image
+      in an OpenShift Virtualization Environment.
+    organization: Default
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    extra_vars:
+      infra_template_name: windows-2022-standard
+    simplified_workflow_nodes:
+      - identifier: Provision Infrastructure
+        unified_job_template: WINDOWS / BSOD / Provision Infrastructure
+        credentials:
+          - OpenShift Credential
+          - Demo Credential
+        extra_data:
+          provider: kubevirt
+          scenario: winpe
+          infra_template_name: windows-2022-standard
+        success_nodes:
+          - Generate WinPE
+      - identifier: Generate WinPE
+        unified_job_template: WINDOWS / BSOD / Generate WinPE
+        inventory: Demo Inventory
+        credentials:
+          - OpenShift Credential
+          - Demo Credential
+        limit: label_app_name_winpe
+        extra_data:
+          create_winpe_destination_file_location: iso_upload
+          create_winpe_enable_autostart: true
+          create_winpe_enable_powershell_modules: false
+          create_winpe_enable_script_debug: false
+          create_winpe_load_drivers: true
+        success_nodes:
+          - Upload WinPE ISO
+      - identifier: Upload WinPE ISO
+        unified_job_template: WINDOWS / BSOD / Upload WinPE ISO
+        inventory: Demo Inventory
+        credentials:
+          - OpenShift Credential
+          - Demo Credential
+        limit: label_app_name_winpe
+        extra_data:
+          provider: kubevirt
+        success_nodes:
+          - Remove Infrastructure
+      - identifier: Remove Infrastructure
+        unified_job_template: WINDOWS / BSOD / Remove Infrastructure
+        inventory: Demo Inventory
+        credentials:
+          - OpenShift Credential
+          - Demo Credential
+        limit: label_app_name_winpe
+        extra_data:
+          provider: kubevirt
Author	SHA1	Message	Date
willtome	96cd52f7a7	fix job template name	2024-08-21 02:55:59 +00:00
willtome	bb75085d86	remove dynamic inventory	2024-08-21 02:52:55 +00:00
willtome	f7d5bc8ec6	fix cred name	2024-08-21 02:51:34 +00:00
willtome	c28a87643b	update inventory name	2024-08-21 02:46:35 +00:00
willtome	d118a2dbef	Adding stuff to stupport scenario 1	2024-08-21 02:39:19 +00:00
willtome	e8ac15f7c0	add provision/remove jobs	2024-08-21 01:58:55 +00:00
Chris Edillon	552acdcb6c	Updated versions of compliance-related roles (#170 )	2024-08-20 13:30:48 -04:00
Chris Edillon	40515ac65b	Create common prerequisites configuration (#169 )	2024-08-16 14:07:59 -04:00
Todd Ruch	70d7c46604	Resolves NETWORK / DISA STIG job logging error (#164 )	2024-08-12 15:18:11 -04:00
Chris Edillon	7455e7fa70	Removed release process from contributor guidelines (#167 )	2024-08-12 15:11:51 -04:00
Matthew Fernandez	d80cc0ac7a	Fix 'Delete VM' JT to actually delete VMs and remove unnecessary CNV … (#162 )	2024-08-05 15:04:33 -04:00
Chris Edillon	120fe3068f	Update pre-commit actions to latest versions (#159 )	2024-07-22 15:35:35 -04:00
Matthew Fernandez	0babde7960	Add EDA Controller Job template (#155 ) Co-authored-by: Chris Edillon <67980205+jce-redhat@users.noreply.github.com>	2024-07-22 15:34:57 -04:00
Matthew Fernandez	4588ef9892	Fix ocp-v inventory to match changes upstream (#157 )	2024-07-22 15:33:29 -04:00
Chris Edillon	19de077c3b	create report server instance (#153 )	2024-07-18 14:45:57 -04:00
Matthew Fernandez	716f2fa74b	add some small fixes (#156 )	2024-06-25 12:55:29 -06:00