diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-10 15:10:32 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-10 15:10:32 +0000 |
commit | c3e5136126e26b0f10234f0aaa5dfb0972b46801 (patch) | |
tree | d6fdbe02061aef71326486e3b2ad74ee7c61b5cf | |
parent | cb787a590656b933f9ae6b3c30bebc44e5a258f0 (diff) | |
parent | 5677e66fc3df2ceb0a9557e60f6931851b213fd9 (diff) |
Merge "Increase maximum shell command timeout to 2h"
-rw-r--r-- | .gitmodules | 4 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch | 33 | ||||
m--------- | upstream/fuel-astute | 0 |
4 files changed, 39 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 5124f69a..1d729b0c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,3 +30,7 @@ path = upstream/fuel-nailgun-agent url = https://github.com/openstack/fuel-nailgun-agent branch = stable/8.0 +[submodule "fuel-astute"] + path = upstream/fuel-astute + url = https://github.com/openstack/fuel-astute.git + branch = stable/8.0 @@ -61,6 +61,7 @@ build: UBUNTU_ARCH="amd64 arm64" \ FUELLIB_REPO=${root}/upstream/fuel-library \ NAILGUN_REPO=${root}/upstream/fuel-web \ + ASTUTE_REPO=${root}/upstream/fuel-astute \ FUEL_AGENT_REPO=${root}/upstream/fuel-agent \ FUEL_NAILGUN_AGENT_REPO=${root}/upstream/fuel-nailgun-agent \ FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \ @@ -68,6 +69,7 @@ build: ODL_CHANGE= \ FUELLIB_COMMIT=HEAD \ NAILGUN_COMMIT=HEAD \ + ASTUTE_COMMIT=HEAD \ FUEL_AGENT_COMMIT=HEAD \ FUEL_NAILGUN_AGENT_COMMIT=HEAD \ FUEL_MIRROR_COMMIT=HEAD \ diff --git a/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch b/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch new file mode 100644 index 00000000..d7048954 --- /dev/null +++ b/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch @@ -0,0 +1,33 @@ +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,7 +4,7 @@ metadata :name => "Execute shell command", + :license => "Apache License 2.0", + :version => "8.0.0", + :url => "http://mirantis.com", +- :timeout => 3600 ++ :timeout => 7200 + + action "execute", :description => "Execute shell command" do + diff --git a/upstream/fuel-astute b/upstream/fuel-astute new file mode 160000 +Subproject b81577a5b7857c4be8748492bae1dec2fa89b44 |