From 726265257c120b43f7c943ef46ce30b95bb2493d Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 17 Jul 2026 10:05:30 +0200 Subject: [PATCH] chore: use agebd_env_suffix in ioc params files --- ansible/tasks/ioc/ioc-install.yml | 4 ++-- .../current/ioc/AGEBD-CPCL-DBPM3CURR_parameters.yaml | 2 +- .../current/ioc/AGEBD-CPCL-INJECTIONGUARD_parameters.yaml | 2 +- services/master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml | 2 +- services/nturns/current/ioc/AGEBD-CPCL-NTURNS_parameters.yaml | 2 +- .../current/ioc/AGEBD-CPCL-ORBITBUMP_parameters.yaml | 2 +- services/plots/current/ioc/AGEBD-CPCL-PLOTS_parameters.yaml | 2 +- .../current/ioc/AGEBD-CPCL-POSTMORTEMLOG_parameters.yaml | 2 +- .../current/ioc/AGEBD-CPCL-SCRUBBING_parameters.yaml | 2 +- .../current/ioc/AGEBD-CPCL-SHIFTTOOL_parameters.yaml | 2 +- services/taubpm/current/ioc/AGEBD-CPCL-TAUBPM_parameters.yaml | 2 +- services/taupct/current/ioc/AGEBD-CPCL-TAUPCT_parameters.yaml | 2 +- services/timing/current/ioc/AGEBD-CPCL-TIMING_parameters.yaml | 2 +- .../current/ioc/AGEBD-CPCL-TOPUPTOOL_parameters.yaml | 2 +- services/tune/current/ioc/AGEBD-CPCL-TUNE_parameters.yaml | 2 +- .../tunebump/current/ioc/AGEBD-CPCL-TUNEBUMP_parameters.yaml | 2 +- .../tunefbx/current/ioc/AGEBD-CPCL-TUNEFBX_parameters.yaml | 2 +- .../tunefby/current/ioc/AGEBD-CPCL-TUNEFBY_parameters.yaml | 2 +- .../AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ansible/tasks/ioc/ioc-install.yml b/ansible/tasks/ioc/ioc-install.yml index 32e392f..8d56fb1 100644 --- a/ansible/tasks/ioc/ioc-install.yml +++ b/ansible/tasks/ioc/ioc-install.yml @@ -70,14 +70,14 @@ regexp: '\{\{\s*agebd_env_suffix\s*\}\}' replace: "{{ env_suffix_upper }}" -# Replace {{ agebd_env }} and {{ ioc_port }} inside the newly renamed params file +# Replace {{ agebd_env_suffix }} and {{ ioc_port }} inside the newly renamed params file - name: "[{{ target_service_name_lower }}] Substitute environment token inside params file" ansible.builtin.replace: path: "{{ ioc_base_dir }}/{{ target_params_name }}" regexp: "{{ item.regexp }}" replace: "{{ item.replace | string }}" with_items: - - { regexp: '\{\{\s*agebd_env\s*\}\}', replace: "{{ env_suffix_lower }}" } + - { regexp: '\{\{\s*agebd_env_suffix\s*\}\}', replace: "{{ env_suffix_lower }}" } - { regexp: '\{\{\s*ioc_port\s*\}\}', replace: "{{ ioc_port }}" } - name: "[{{ target_service_name_lower }}] Run ioc install" diff --git a/services/dbpm3curr/current/ioc/AGEBD-CPCL-DBPM3CURR_parameters.yaml b/services/dbpm3curr/current/ioc/AGEBD-CPCL-DBPM3CURR_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/dbpm3curr/current/ioc/AGEBD-CPCL-DBPM3CURR_parameters.yaml +++ b/services/dbpm3curr/current/ioc/AGEBD-CPCL-DBPM3CURR_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_parameters.yaml b/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_parameters.yaml +++ b/services/injectionguard/current/ioc/AGEBD-CPCL-INJECTIONGUARD_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml b/services/master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml +++ b/services/master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/nturns/current/ioc/AGEBD-CPCL-NTURNS_parameters.yaml b/services/nturns/current/ioc/AGEBD-CPCL-NTURNS_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/nturns/current/ioc/AGEBD-CPCL-NTURNS_parameters.yaml +++ b/services/nturns/current/ioc/AGEBD-CPCL-NTURNS_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_parameters.yaml b/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_parameters.yaml +++ b/services/orbitbump/current/ioc/AGEBD-CPCL-ORBITBUMP_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/plots/current/ioc/AGEBD-CPCL-PLOTS_parameters.yaml b/services/plots/current/ioc/AGEBD-CPCL-PLOTS_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/plots/current/ioc/AGEBD-CPCL-PLOTS_parameters.yaml +++ b/services/plots/current/ioc/AGEBD-CPCL-PLOTS_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/postmortemlog/current/ioc/AGEBD-CPCL-POSTMORTEMLOG_parameters.yaml b/services/postmortemlog/current/ioc/AGEBD-CPCL-POSTMORTEMLOG_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/postmortemlog/current/ioc/AGEBD-CPCL-POSTMORTEMLOG_parameters.yaml +++ b/services/postmortemlog/current/ioc/AGEBD-CPCL-POSTMORTEMLOG_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/scrubbing/current/ioc/AGEBD-CPCL-SCRUBBING_parameters.yaml b/services/scrubbing/current/ioc/AGEBD-CPCL-SCRUBBING_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/scrubbing/current/ioc/AGEBD-CPCL-SCRUBBING_parameters.yaml +++ b/services/scrubbing/current/ioc/AGEBD-CPCL-SCRUBBING_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/shifttool/current/ioc/AGEBD-CPCL-SHIFTTOOL_parameters.yaml b/services/shifttool/current/ioc/AGEBD-CPCL-SHIFTTOOL_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/shifttool/current/ioc/AGEBD-CPCL-SHIFTTOOL_parameters.yaml +++ b/services/shifttool/current/ioc/AGEBD-CPCL-SHIFTTOOL_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/taubpm/current/ioc/AGEBD-CPCL-TAUBPM_parameters.yaml b/services/taubpm/current/ioc/AGEBD-CPCL-TAUBPM_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/taubpm/current/ioc/AGEBD-CPCL-TAUBPM_parameters.yaml +++ b/services/taubpm/current/ioc/AGEBD-CPCL-TAUBPM_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/taupct/current/ioc/AGEBD-CPCL-TAUPCT_parameters.yaml b/services/taupct/current/ioc/AGEBD-CPCL-TAUPCT_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/taupct/current/ioc/AGEBD-CPCL-TAUPCT_parameters.yaml +++ b/services/taupct/current/ioc/AGEBD-CPCL-TAUPCT_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/timing/current/ioc/AGEBD-CPCL-TIMING_parameters.yaml b/services/timing/current/ioc/AGEBD-CPCL-TIMING_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/timing/current/ioc/AGEBD-CPCL-TIMING_parameters.yaml +++ b/services/timing/current/ioc/AGEBD-CPCL-TIMING_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/topuptool/current/ioc/AGEBD-CPCL-TOPUPTOOL_parameters.yaml b/services/topuptool/current/ioc/AGEBD-CPCL-TOPUPTOOL_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/topuptool/current/ioc/AGEBD-CPCL-TOPUPTOOL_parameters.yaml +++ b/services/topuptool/current/ioc/AGEBD-CPCL-TOPUPTOOL_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/tune/current/ioc/AGEBD-CPCL-TUNE_parameters.yaml b/services/tune/current/ioc/AGEBD-CPCL-TUNE_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/tune/current/ioc/AGEBD-CPCL-TUNE_parameters.yaml +++ b/services/tune/current/ioc/AGEBD-CPCL-TUNE_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/tunebump/current/ioc/AGEBD-CPCL-TUNEBUMP_parameters.yaml b/services/tunebump/current/ioc/AGEBD-CPCL-TUNEBUMP_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/tunebump/current/ioc/AGEBD-CPCL-TUNEBUMP_parameters.yaml +++ b/services/tunebump/current/ioc/AGEBD-CPCL-TUNEBUMP_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/tunefbx/current/ioc/AGEBD-CPCL-TUNEFBX_parameters.yaml b/services/tunefbx/current/ioc/AGEBD-CPCL-TUNEFBX_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/tunefbx/current/ioc/AGEBD-CPCL-TUNEFBX_parameters.yaml +++ b/services/tunefbx/current/ioc/AGEBD-CPCL-TUNEFBX_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/services/tunefby/current/ioc/AGEBD-CPCL-TUNEFBY_parameters.yaml b/services/tunefby/current/ioc/AGEBD-CPCL-TUNEFBY_parameters.yaml index ff8e70f..6c115a3 100644 --- a/services/tunefby/current/ioc/AGEBD-CPCL-TUNEFBY_parameters.yaml +++ b/services/tunefby/current/ioc/AGEBD-CPCL-TUNEFBY_parameters.yaml @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ agebd_env }} +ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }} ioc_port: {{ ioc_port }} os: RHEL8 os_id: rhel diff --git a/templates/service/{{service_name_lower}}/current/ioc/AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja b/templates/service/{{service_name_lower}}/current/ioc/AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja index 9706056..68c6830 100644 --- a/templates/service/{{service_name_lower}}/current/ioc/AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja +++ b/templates/service/{{service_name_lower}}/current/ioc/AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja @@ -1,6 +1,6 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01{{ '{{ agebd_env }}' }} +ioc_host: sls-vserv-bd-01{{ '{{ agebd_env_suffix }}' }} ioc_port: {{ '{{ ioc_port }}' }} os: RHEL8 os_id: rhel