To download from libvirt-xml path, adding such response: - SRV_HTTP_HOST - SRV_HTTP_PORT
Signed-off-by: Ren Wen 15991987063@163.com --- container/scheduler/start | 3 +++ src/scheduler/constants.cr | 3 +++ src/scheduler/find_job_boot.cr | 2 ++ 3 files changed, 8 insertions(+)
diff --git a/container/scheduler/start b/container/scheduler/start index 70a3496..c32a7a8 100755 --- a/container/scheduler/start +++ b/container/scheduler/start @@ -25,6 +25,8 @@ names = Set.new %w[ SSHR_PORT SSHR_PORT_BASE SSHR_PORT_LEN + SRV_HTTP_HOST + SRV_HTTP_PORT lab ]
@@ -35,6 +37,7 @@ defaults['SSHR_PORT_LEN'] ||= 2000 defaults['SCHED_PORT'] ||= '3000' defaults['SCHED_HOST'] ||= '172.17.0.1' defaults['MASTER_FLUENTD_PORT'] ||= '24224' +defaults['SRV_HTTP_PORT'] ||= '11300' env = docker_env(defaults)
CCI_REPOS = ENV['CCI_REPOS'] || '/c' diff --git a/src/scheduler/constants.cr b/src/scheduler/constants.cr index 1146b21..668da6d 100644 --- a/src/scheduler/constants.cr +++ b/src/scheduler/constants.cr @@ -23,6 +23,9 @@ INITRD_HTTP_PORT = (ENV.has_key?("INITRD_HTTP_PORT") ? ENV["INITRD_HTTP_PORT"] : OS_HTTP_HOST = (ENV.has_key?("OS_HTTP_HOST") ? ENV["OS_HTTP_HOST"] : "172.17.0.1") OS_HTTP_PORT = (ENV.has_key?("OS_HTTP_PORT") ? ENV["OS_HTTP_PORT"] : 8000).to_i32
+SRV_HTTP_HOST = (ENV.has_key?("SRV_HTTP_HOST") ? ENV["SRV_HTTP_HOST"] : "172.17.0.1") +SRV_HTTP_PORT = (ENV.has_key?("SRV_HTTP_PORT") ? ENV["SRV_HTTP_PORT"] : "11300") + CCI_REPOS = (ENV.has_key?("CCI_REPOS") ? ENV["CCI_REPOS"] : "/c") LAB_REPO = "lab-z9"
diff --git a/src/scheduler/find_job_boot.cr b/src/scheduler/find_job_boot.cr index 152d549..3f446b2 100644 --- a/src/scheduler/find_job_boot.cr +++ b/src/scheduler/find_job_boot.cr @@ -183,6 +183,8 @@ class Sched "LKP_SERVER" => job["LKP_SERVER"]?, "vt" => job["vt"]?, "RESULT_WEBDAV_PORT" => job["RESULT_WEBDAV_PORT"]? || "3080", + "SRV_HTTP_HOST" => SRV_HTTP_HOST, + "SRV_HTTP_PORT" => SRV_HTTP_PORT, }.to_json end
-
Ren Wen