Ppmac update#281
Conversation
There was a problem hiding this comment.
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.pyalways supplies an inline inventory (-i <hostname>,) foransible-playbook. - Bump PowerPMAC required module from
ppmac_7d627e7toppmac_91b4edcand remove the StreamDevice protocol-path env var. - Simplify/modernize
powerpmacsubstitution templates and verification expectations (remove several old substitution files; makecs.substitutionsconditional onvirtual_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.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Did you run from |
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.