projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3177-collection-choose-files
[arvados.git]
/
services
/
api
/
test
/
fixtures
/
keep_services.yml
diff --git
a/services/api/test/fixtures/keep_services.yml
b/services/api/test/fixtures/keep_services.yml
index 0fde804dbb14ac6bdfc588d0db5dc092c1bbadc3..84ac316d0e593ffbca008fcd57aa4677f5471652 100644
(file)
--- a/
services/api/test/fixtures/keep_services.yml
+++ b/
services/api/test/fixtures/keep_services.yml
@@
-4,10
+4,20
@@
keep0:
service_host: keep0.qr1hi.arvadosapi.com
service_port: 25107
service_ssl_flag: false
service_host: keep0.qr1hi.arvadosapi.com
service_port: 25107
service_ssl_flag: false
+ service_type: disk
keep1:
uuid: zzzzz-bi6l4-rsnj3c76ndxb7o0
owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
service_host: keep1.qr1hi.arvadosapi.com
service_port: 25107
keep1:
uuid: zzzzz-bi6l4-rsnj3c76ndxb7o0
owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
service_host: keep1.qr1hi.arvadosapi.com
service_port: 25107
- service_ssl_flag: false
\ No newline at end of file
+ service_ssl_flag: false
+ service_type: disk
+
+proxy:
+ uuid: zzzzz-bi6l4-h0a0xwut9qa6g3a
+ owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
+ service_host: keep.qr1hi.arvadosapi.com
+ service_port: 25333
+ service_ssl_flag: true
+ service_type: proxy