@@ -1346,6 +1346,7 @@ defaults:
13461346 qc_remote_jit_enabled : " true"
13471347 user : flp
13481348 extra_env_vars : " "
1349+ readout_folder : " any"
13491350vars :
13501351 auto_stop_enabled : " {{ !strings.IsFalsy(auto_stop_timeout) }}"
13511352 ddsched_enabled : " {{ epn_enabled == 'true' && dd_enabled == 'true' }}"
@@ -1359,8 +1360,8 @@ roles:
13591360 enabled : " {{ ctp_readout_enabled == 'true' }}"
13601361 vars :
13611362 detector : " {{ctp_readout_enabled == 'true' ? inventory.DetectorForHost( ctp_readout_host ) : \"\" }}"
1362- readout_cfg_uri_standalone : " consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath ('readout/' + run_type + '/any/ readout-standalone-' + ctp_readout_host)}}"
1363- readout_cfg_uri_stfb : " consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'any' , 'readout-stfb-' + ctp_readout_host)}}"
1363+ readout_cfg_uri_standalone : " consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve ('readout', run_type, 'standalone', ' readout-standalone-' + ctp_readout_host)}}"
1364+ readout_cfg_uri_stfb : " consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, readout_folder , 'readout-stfb-' + ctp_readout_host)}}"
13641365 dd_discovery_ib_hostname : " {{ ctp_readout_host }}-ib" # MUST be defined for all stfb and stfs
13651366 # dpl_workflow is set to ctp_dpl_workflow
13661367 dpl_workflow : " {{ util.PrefixedOverride( 'dpl_workflow', 'ctp' ) }}"
@@ -1491,8 +1492,8 @@ roles:
14911492 var : it
14921493 vars :
14931494 detector : " {{ inventory.DetectorForHost( it ) }}"
1494- readout_cfg_uri_standalone : " consul-ini://{{ consul_endpoint }}/o2/components/{{config.ResolvePath ('readout/' + run_type + '/any/ readout-standalone-' + it)}}"
1495- readout_cfg_uri_stfb : " consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, 'any' , 'readout-stfb-' + it)}}"
1495+ readout_cfg_uri_standalone : " consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve ('readout', run_type, 'standalone', ' readout-standalone-' + it)}}"
1496+ readout_cfg_uri_stfb : " consul-ini://{{ consul_endpoint }}/o2/components/{{config.Resolve('readout', run_type, readout_folder , 'readout-stfb-' + it)}}"
14961497 dd_discovery_ib_hostname : " {{ it }}-ib" # MUST be defined for all stfb and stfs
14971498 # dpl_workflow is set to <detector>_dpl_workflow if such an override exists
14981499 dpl_workflow : " {{ util.PrefixedOverride( 'dpl_workflow', strings.ToLower( inventory.DetectorForHost( it ) ) ) }}"
0 commit comments