Skip to content

Ppmac update#281

Merged
John Sinsheimer (johnsinsheimer) merged 7 commits into
mainfrom
ppmac-update
Jul 10, 2026
Merged

Ppmac update#281
John Sinsheimer (johnsinsheimer) merged 7 commits into
mainfrom
ppmac-update

Conversation

@johnsinsheimer

Copy link
Copy Markdown
Contributor

Updated ppmac commit hash to latest version to remove stream device. Also a fix was needed in the deployment test

pixi run deployment -l xf31id1-inst-ioc2.nsls2.bnl.gov -t powerpmac

was complaining that the host wasn't in the inventory.

Copilot AI review requested due to automatic review settings July 10, 2026 04:03

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Updates the PowerPMAC IOC deployment to use a newer ppmac module revision (removing StreamDevice-related configuration) and adjusts deployment tooling/templates so local deployment tests can target a hostname that is not present in an Ansible inventory.

Changes:

  • Ensure scripts/deploy_local_config.py always supplies an inline inventory (-i <hostname>,) for ansible-playbook.
  • Bump PowerPMAC required module from ppmac_7d627e7 to ppmac_91b4edc and remove the StreamDevice protocol-path env var.
  • Simplify/modernize powerpmac substitution templates and verification expectations (remove several old substitution files; make cs.substitutions conditional on virtual_axes).

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
scripts/deploy_local_config.py Always passes an inline inventory to fix “host not in inventory” failures during local deployments.
roles/install_module/vars/ppmac_91b4edc.yml Adds a new ppmac module pin for commit 91b4edc.
roles/install_module/vars/ppmac_7d627e7.yml Removes the old ppmac module pin.
roles/deploy_ioc/vars/powerpmac.yml Switches required module to ppmac_91b4edc and drops StreamDevice protocol env configuration.
roles/device_roles/powerpmac/tasks/main.yml Removes deprecated substitution installs and installs cs.substitutions only when virtual_axes are defined.
roles/device_roles/powerpmac/templates/base.cmd.j2 Stops loading removed substitution templates and conditionally loads cs.substitutions.
roles/device_roles/powerpmac/templates/motor.substitutions.j2 Updates motor substitutions to match the newer module’s expected substitution content.
roles/device_roles/powerpmac/templates/motorstatus.substitutions.j2 Updates motor status substitutions to match the newer module’s expected substitution content.
roles/device_roles/powerpmac/templates/pmacStatus.substitutions.j2 Updates status substitutions to use updated port macro expectations.
roles/device_roles/powerpmac/templates/cs.substitutions.j2 Updates coordinate system substitution generation and adds motor-in-CS entries.
roles/device_roles/powerpmac/templates/pmacaux.substitutions.j2 Removes obsolete substitution template.
roles/device_roles/powerpmac/templates/pmac_physical_limit.substitutions.j2 Removes obsolete substitution template.
roles/device_roles/powerpmac/templates/pmac_asyn_motor.substitutions.j2 Removes obsolete substitution template.
roles/device_roles/powerpmac/examples/mc01/verify.yml Updates verification to reflect new substitutions (including cs.substitutions when virtual axes exist).
roles/device_roles/powerpmac/examples/mc02/verify.yml Updates verification to reflect removed substitution files and conditional CS loading.
roles/device_roles/powerpmac/examples/mc03/verify.yml Updates verification to reflect removed substitution files and conditional CS loading.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread roles/install_module/vars/ppmac_91b4edc.yml Outdated
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@jwlodek

Copy link
Copy Markdown
Collaborator

was complaining that the host wasn't in the inventory

Did you run from runansible? From there the inventory is automatically sync-ed from explorer. I think with this change it should be possible to execute deployments from your personal machine though, which is pretty convenient.

@johnsinsheimer John Sinsheimer (johnsinsheimer) merged commit 7954c47 into main Jul 10, 2026
11 checks passed
@johnsinsheimer John Sinsheimer (johnsinsheimer) deleted the ppmac-update branch July 10, 2026 17:48
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.

3 participants