diff --git a/workflows/readout-dataflow.yaml b/workflows/readout-dataflow.yaml index 619db406d..26a35374a 100755 --- a/workflows/readout-dataflow.yaml +++ b/workflows/readout-dataflow.yaml @@ -1346,6 +1346,7 @@ defaults: qc_remote_jit_enabled: "true" user: flp extra_env_vars: "" + readout_folder: "any" vars: auto_stop_enabled: "{{ !strings.IsFalsy(auto_stop_timeout) }}" ddsched_enabled: "{{ epn_enabled == 'true' && dd_enabled == 'true' }}" @@ -1359,8 +1360,8 @@ roles: enabled: "{{ ctp_readout_enabled == 'true' }}" vars: detector: "{{ctp_readout_enabled == 'true' ? inventory.DetectorForHost( ctp_readout_host ) : \"\" }}" - readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout/' + run_type + '/any/readout-standalone-' + ctp_readout_host)}}" - readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'any', 'readout-stfb-' + ctp_readout_host)}}" + readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'standalone', 'readout-standalone-' + ctp_readout_host)}}" + readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, readout_folder, 'readout-stfb-' + ctp_readout_host)}}" dd_discovery_ib_hostname: "{{ ctp_readout_host }}-ib" # MUST be defined for all stfb and stfs # dpl_workflow is set to ctp_dpl_workflow dpl_workflow: "{{ util.PrefixedOverride( 'dpl_workflow', 'ctp' ) }}" @@ -1491,8 +1492,8 @@ roles: var: it vars: detector: "{{ inventory.DetectorForHost( it ) }}" - readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath('readout/' + run_type + '/any/readout-standalone-' + it)}}" - readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'any', 'readout-stfb-' + it)}}" + readout_cfg_uri_standalone: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'standalone', 'readout-standalone-' + it)}}" + readout_cfg_uri_stfb: "consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, readout_folder, 'readout-stfb-' + it)}}" dd_discovery_ib_hostname: "{{ it }}-ib" # MUST be defined for all stfb and stfs # dpl_workflow is set to _dpl_workflow if such an override exists dpl_workflow: "{{ util.PrefixedOverride( 'dpl_workflow', strings.ToLower( inventory.DetectorForHost( it ) ) ) }}"