Change orchestrator_cvd_creation_timeout_secs to comment default

Change orchestrator_cvd_creation_timeout_secs to comment and orchestrator will use golang default value for this. This simplifies making custom option for specific environment. Change Dockerfile to use echo command to apply orchestrator_cvd_creation_timeout_secs
google · Mar 21, 2024 · 9e91557 · 9e91557
1 parent cf257d5
commit 9e91557
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker/arm-server/Dockerfile b/docker/arm-server/Dockerfile
@@ -40,7 +40,7 @@ RUN apt install -y -f \
 
 RUN echo "num_cvd_accounts=100" >> /etc/default/cuttlefish-host-resources
 
-RUN sed -i s/.*orchestrator_cvd_creation_timeout_secs.*/orchestrator_cvd_creation_timeout_secs=1800/g /etc/default/cuttlefish-host_orchestrator
+RUN echo "orchestrator_cvd_creation_timeout_secs=1800" >> /etc/default/cuttlefish-host_orchestrator
 
 RUN usermod -aG kvm root
 RUN usermod -aG cvdnetwork root

diff --git a/frontend/debian/cuttlefish-orchestration.cuttlefish-host_orchestrator.default b/frontend/debian/cuttlefish-orchestration.cuttlefish-host_orchestrator.default
@@ -26,7 +26,7 @@ orchestrator_cvd_artifacts_dir=/var/lib/cuttlefish-common
 #
 # Timeout for CVD creation
 # Defaults to 7 mins
-orchestrator_cvd_creation_timeout_secs=420
+# orchestrator_cvd_creation_timeout_secs=420
 #
 # Where web UI in the application is from
 # If it isn't empty, the application uses web UI from the url,