diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-09 21:44:07 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-12 11:26:52 +0000 |
| commit | 3d6d13ffb4d44c27837884fcb4be337615acc514 (patch) | |
| tree | 200cbf1bd6d923685cd37999de695c9a767cba6d /patches/fuel-astute | |
| parent | 0ab4e02509f91581a4ade9eee78f4279adc8232f (diff) | |
Rework: Move fuel-astute patch to post-install.
IMPORTANT:
Drop `fuel-astute` submodule, and patch it instead during the Fuel
Master node bootstrapping process, using an OPNFV post.d script.
Luckily, this fits well with the recently added script that prepares
FM for cross-building.
One step closer to un-forking.
Change-Id: Ia612e0ad4077b16baf54f1b9ebf9d207daca0be4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-astute')
| -rw-r--r-- | patches/fuel-astute/0001-Increase-maximum-shell-command-timeout-to-2h.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout-to-2h.patch b/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout-to-2h.patch deleted file mode 100644 index abcb9283..00000000 --- a/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout-to-2h.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -Date: Mon, 9 May 2016 18:54:33 -0700 -Subject: [PATCH] Increase maximum shell command timeout to 2h - -Since `execute_shell_command` mcagent is used for building the target -image and the timeout provided in the astute task is just respected on -the Astute level (on mcollective level this timeout is actually a -minumum between value provided and ddl value) we need to increase it -for Armband operation. - -Because Armband builds the target image via `qemu-debootstrap`, it can -take more than 1 hour to finish the building. Therefore aside of -increasing the timeout in the Astute task, the maximum timeout value -for mcagent has to be increased. - -Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> ---- - mcagents/execute_shell_command.ddl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mcagents/execute_shell_command.ddl b/mcagents/execute_shell_command.ddl -index 0480be7..ad58046 100644 ---- a/mcagents/execute_shell_command.ddl -+++ b/mcagents/execute_shell_command.ddl -@@ -4,5 +4,5 @@ metadata :name => "Execute shell command", - :url => "http://mirantis.com", -- :timeout => 3600 -+ :timeout => 7200 - - action "execute", :description => "Execute shell command" do - |