Skip to content

Seed Zero-Day Response into AO Install - #389

Merged
IPvSean merged 1 commit into
ansible:mainfrom
oatakan:add-zero-day-response-seed
Nov 11, 2026
Merged

IPvSean merged 1 commit into
ansible:mainfrom
oatakan:add-zero-day-response-seed

Conversation

@oatakan

@oatakan oatakan commented Oct 31, 2026

Copy link
Copy Markdown
Contributor

Adds the zero-day-response and zero-day-response-fix entries to infrastructure/ao/demos.yml (both workflows
and the twelve demo-owned p2s-* job templates) and a row plus two seed-list mentions in infrastructure/docs/automation-orchestrator.md.
Same shape as #370 (Multi-OS Cloud Patching). Infrastructure section only.

Depends on ansible-tmm/aap-orchestrator-demos#12: the seed downloads that repo's main, so merge that
first.

Needs. The preloaded AWS and APD Machine credentials and LiteMaaS. The demo provisions its own estate through
p2s-estate-provision; it does not need the cloud stack or Mattermost.

Tested. On a Red Hat Demo Platform "Ansible Product Demos" environment: Uninstall, then Install from this branch
with ao_demos_repository/ao_demos_ref pointed at the fork's PR branch (a test-only commit, not part of this PR),
seeded both workflows and all twelve job templates; both workflows then ran green, and again after a later re-seed
with the demo's final AI wording. pre-commit (.pre-commit-gh.yml,
ansible-lint skipped) passes locally on both changed files; the fork's Actions run https://github.com/oatakan/ansible-product-demos/actions/runs/41014020938 (pre-commit-27) is green.

🤖 Generated with Claude Code

https://claude.ai/code/session_01RDaQ1UYzj2bq8iJgo9m2o2

@IPvSean IPvSean left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shape matches the Multi-OS seed pattern — two enabled slugs (flow A owns the p2s-* JTs, flow B reuses them with job_templates: []), requires_cloud_stack: false, and playbook paths line up with ansible-tmm/aap-orchestrator-demos#12.

Hold merge until ansible-tmm/aap-orchestrator-demos#12 lands on main. Seed uses ao_demos_ref: main, and zero-day-response/ is not on that repo’s main yet — merging this first would make Install point at missing workflows/playbooks.

Inlines below are mostly merge-order / docs polish; the demos.yml content itself looks ready once the dependency is in.

requires_mattermost: false
job_templates: []

- slug: zero-day-response

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge order: ao_demos_ref is still main, and zero-day-response/ is 404 on ansible-tmm/aap-orchestrator-demos main today (only on PR #12).

Please keep this PR open until that lands — otherwise the next APD Install that seeds enabled: true entries will try to import zero-day-response/ao/flow-a-know-contain.json (and create JTs against playbooks) that do not exist yet.

Author already called this out in the PR body; treating it as a hard gate before merge.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, this stays open until ansible-tmm/aap-orchestrator-demos#12 is merged to main. #12 had fallen behind main with a _config.yml conflict; I merged main into it (68acfc4) and it's mergeable again.

workflow: zero-day-response/ao/flow-b-fix-prove.json
requires_cloud_stack: false
requires_mattermost: false
job_templates: []

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same pattern as multi-os (job_templates: [] while the sibling slug owns the JTs) — good. Flow B refs (p2s-fix-*, shared scan/AI/case-record) are covered by the list above.

Minor: the Install docs bullet only names zero-day-response; both slugs are enabled: true, so seed will also import zero-day-response-fix. Worth naming both in automation-orchestrator.md so presenters know two AO workflows show up.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 9de5b02: the Install summary lists both zero-day-response and zero-day-response-fix, and a short "Zero-Day Response — two workflows" section names both AO workflows as presenters see them.

Comment thread infrastructure/ao/demos.yml Outdated
playbook: zero-day-response/playbooks/estate_configure.yml
credentials:
- machine
ask_variables_on_launch: true

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: every JT sets ask_variables_on_launch: true (and ensure_job_template.yml already defaults that to true). Disk-utilization only opts in where needed (Notify Chatroom).

Fine if intentional for demo flexibility — otherwise you could drop the repeated keys and rely on the seed default, or set false on steps that should not prompt when launched from AO.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Every step does take extra vars from AO, but ensure_job_template.yml already defaults to true, so I dropped the twelve repeated keys in 9de5b02. The seeded templates are unchanged.

| Task Step Example | Open **Task Step Example** in AO — question is pre-filled; press Run | LiteMaaS wired (RHDP boot + Install) |
| Disk utilization | [Disk Utilization & Remediation](https://ansible-tmm.github.io/aap-orchestrator-demos/demos/disk-utilization/) | `aws-rhel9` + Mattermost |
| Multi-OS Cloud Patching | [Multi-OS Cloud Patching](https://ansible-tmm.github.io/aap-orchestrator-demos/demos/multi-os-cloud-patching/) | Full cloud stack + existing **Cloud \| AWS \|*** JTs |
| Zero-Day Response | [Zero-Day Response](https://ansible-tmm.github.io/aap-orchestrator-demos/demos/zero-day-response/) | Its own six-instance AWS estate (no cloud stack, no Mattermost): **p2s-estate-provision**, update **AWS Inventory**, then **p2s-estate-configure** |

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prep sequence looks right (provision → AWS Inventory sync → configure), and the six-instance count matches nodes-aws.yml.

Please also call out that this depends on ansible-tmm/aap-orchestrator-demos#12 being on main (or that Install must use a ref that contains zero-day-response/), and that two AO workflows are seeded (KNOW/CONTAIN + FIX/PROVE). The GitHub Pages link will 404 until that demos PR’s site content is published too.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

9de5b02 adds the two-workflow note and says ao_demos_ref must point at a ref that contains zero-day-response/. I kept the PR number and the 404 out of the doc itself: this PR merges only after #12, when the folder and the page are already on main, so that note would be stale on arrival. The merge order stays in the PR description.


- Reads [`demos.yml`](../ao/demos.yml) and seeds entries with `enabled: true` from [aap-orchestrator-demos](https://github.com/ansible-tmm/aap-orchestrator-demos) (**disk-utilization**, **multi-os-cloud-patching**) plus local workflows such as **Task Step Example**.
- Creates the **AAP Orchestrator Demos** project and any demo-owned job templates (disk-utilization playbooks). Multi-OS reuses existing **Cloud | AWS |*** templates from cloud setup — seed only imports the workflow.
- Reads [`demos.yml`](../ao/demos.yml) and seeds entries with `enabled: true` from [aap-orchestrator-demos](https://github.com/ansible-tmm/aap-orchestrator-demos) (**disk-utilization**, **multi-os-cloud-patching**, **zero-day-response**) plus local workflows such as **Task Step Example**.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

List says zero-day-response only; demos.yml enables both zero-day-response and zero-day-response-fix. Suggest e.g. zero-day-response / zero-day-response-fix so the Install summary matches what operators see in AO.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 9de5b02; both slugs are listed.

@IPvSean IPvSean left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict resolution

Merged upstream/main into this branch and resolved conflicts in:

  • infrastructure/ao/demos.yml — kept both cicd-pipeline (from #393) and the two Zero-Day slugs
  • infrastructure/docs/automation-orchestrator.md — table + under-the-hood bullets now list CI/CD and Zero-Day together

Pushed to oatakan:add-zero-day-response-seed. PR is MERGEABLE again (checks may still be settling).

Review of the seed changes

Shape matches Multi-OS / CI/CD seed patterns:

  • zero-day-response owns the twelve p2s-* JTs; zero-day-response-fix reuses with job_templates: []
  • requires_cloud_stack: false / no Mattermost — aligned with the hub docs
  • Workflow paths and JT names match aap-orchestrator-demos#12 (flow-a-know-contain / flow-b-fix-prove); estate provision/configure JTs are correctly seeded for the presenter path even though they are not AO nodes
  • Dropping redundant ask_variables_on_launch: true is fine (ensure_job_template.yml already defaults it)

Hold merge

Still do not merge until ansible-tmm/aap-orchestrator-demos#12 lands on main. Seed uses ao_demos_ref: main and zero-day-response/ is not on that repo’s main yet — Install would download missing workflows/playbooks.

@oatakan

oatakan commented Nov 10, 2026

Copy link
Copy Markdown
Contributor Author

Thanks for resolving the conflict and for the review. Agreed, this waits until ansible-tmm/aap-orchestrator-demos#12 is merged; #12 is clean against main and ready for review.

@IPvSean IPvSean left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pre-commit is green. Approved — holding merge until ansible-tmm/aap-orchestrator-demos#12 lands first (seed reads main).

Add zero-day-response and zero-day-response-fix to demos.yml (twelve
p2s-* job templates on the KNOW+CONTAIN slug) and document both workflows
in the AO hub. Same seed shape as Multi-OS / CI/CD.

Depends on ansible-tmm/aap-orchestrator-demos#12 landing on main first.

Co-authored-by: Sean Cavanaugh <sean@cavanaugh.pro>
Co-authored-by: Cursor <cursoragent@cursor.com>
@IPvSean
IPvSean force-pushed the add-zero-day-response-seed branch from f3f215f to ef31014 Compare November 11, 2026 16:03
@IPvSean
IPvSean merged commit 49bf38e into ansible:main Nov 11, 2026
1 check passed
@oatakan
oatakan deleted the add-zero-day-response-seed branch November 11, 2026 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants