@@ -1346,6 +1346,7 @@ defaults:
1346
1346
qc_remote_jit_enabled : " true"
1347
1347
user : flp
1348
1348
extra_env_vars : " "
1349
+ readout_folder : " any"
1349
1350
vars :
1350
1351
auto_stop_enabled : " {{ !strings.IsFalsy(auto_stop_timeout) }}"
1351
1352
ddsched_enabled : " {{ epn_enabled == 'true' && dd_enabled == 'true' }}"
@@ -1359,8 +1360,8 @@ roles:
1359
1360
enabled : " {{ ctp_readout_enabled == 'true' }}"
1360
1361
vars :
1361
1362
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)}}"
1364
1365
dd_discovery_ib_hostname : " {{ ctp_readout_host }}-ib" # MUST be defined for all stfb and stfs
1365
1366
# dpl_workflow is set to ctp_dpl_workflow
1366
1367
dpl_workflow : " {{ util.PrefixedOverride( 'dpl_workflow', 'ctp' ) }}"
@@ -1491,8 +1492,8 @@ roles:
1491
1492
var : it
1492
1493
vars :
1493
1494
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)}}"
1496
1497
dd_discovery_ib_hostname : " {{ it }}-ib" # MUST be defined for all stfb and stfs
1497
1498
# dpl_workflow is set to <detector>_dpl_workflow if such an override exists
1498
1499
dpl_workflow : " {{ util.PrefixedOverride( 'dpl_workflow', strings.ToLower( inventory.DetectorForHost( it ) ) ) }}"
0 commit comments