aboutsummaryrefslogtreecommitdiffstats
path: root/patches/fuel-web
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-13 11:10:21 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-13 11:10:21 +0000
commit18e01e000ea30da07757e1ef8b9c82bb9305d059 (patch)
tree4a185959f4990575d92ba250bdc82548896a2637 /patches/fuel-web
parentde47e68c6e5df97cdf656f7e70cd6e6b0582bd30 (diff)
parentecf9055d532dae7f209e9f4591a8129dd52627b2 (diff)
Merge "Rework: Move nailgun timeout patch to postinstall"
Diffstat (limited to 'patches/fuel-web')
-rw-r--r--patches/fuel-web/0007-Increase-target-image-build-timeout.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/patches/fuel-web/0007-Increase-target-image-build-timeout.patch b/patches/fuel-web/0007-Increase-target-image-build-timeout.patch
deleted file mode 100644
index 218f0339..00000000
--- a/patches/fuel-web/0007-Increase-target-image-build-timeout.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Stanislaw Kardach <kda@semihalf.com>
-Date: Thu, 21 Apr 2016 15:36:27 -0700
-Subject: [PATCH] Increase target image build timeout
-
-Currently we're close to 40 minutes of image building (thanks to
-qemu-debootstrap). If network connectivity is a bit slow (happened to
-me) it's easy to go over 1h limit. Therefore let's push this to 2 hours
-to be safer.
-
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
----
- nailgun/nailgun/settings.yaml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nailgun/nailgun/settings.yaml b/nailgun/nailgun/settings.yaml
-index 495a9c3..ac52141 100644
---- a/nailgun/nailgun/settings.yaml
-+++ b/nailgun/nailgun/settings.yaml
-@@ -85,7 +85,7 @@ COLLECTOR_INST_INFO_URL: "https://{collector_server}/api/v1/installation_structu
- COLLECTOR_OSWL_INFO_URL: "https://{collector_server}/api/v1/oswl_stats/"
- COLLECTOR_PING_URL: "https://{collector_server}/api/v1/ping/"
-
--PROVISIONING_IMAGES_BUILD_TIMEOUT: 3600
-+PROVISIONING_IMAGES_BUILD_TIMEOUT: 7200
- PROVISIONING_IMAGES_PATH: "/var/www/nailgun/targetimages"
-
- REPO_PRIORITIES: