You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/09/22 21:44:15 UTC
[16/50] git commit: updated refs/heads/master to 1290e10
CLOUDSTACK-7143: tune timeouts to expect about <=~60 min build
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f67a379a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f67a379a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f67a379a
Branch: refs/heads/master
Commit: f67a379a466430e1158eddeb42de28aa84283947
Parents: 654c871
Author: Leo Simons <ls...@schubergphilis.com>
Authored: Mon Jul 21 13:06:34 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Sep 22 21:38:12 2014 +0200
----------------------------------------------------------------------
.../definitions/systemvmtemplate/definition.rb | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f67a379a/tools/appliance/definitions/systemvmtemplate/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
index ac67075..a4ba2fe 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -26,7 +26,7 @@ config = {
:cpu_count => '1',
:memory_size => '256',
:disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
- :iso_download_timeout => '1000',
+ :iso_download_timeout => '1200',
:boot_wait => '10',
:boot_cmd_sequence => [
'<Esc>',
@@ -46,9 +46,9 @@ config = {
'<Enter>'
],
:kickstart_port => '7122',
- :kickstart_timeout => '10000',
+ :kickstart_timeout => '1200',
:kickstart_file => 'preseed.cfg',
- :ssh_login_timeout => '10000',
+ :ssh_login_timeout => '1200',
:ssh_user => 'root',
:ssh_password => 'password',
:ssh_key => '',
@@ -57,6 +57,7 @@ config = {
:sudo_cmd => "echo '%p'|sudo -S sh '%f'",
:shutdown_cmd => 'halt -p',
:postinstall_files => [
+ # basic minimal vm creation
'build_time.sh',
'apt_upgrade.sh',
'configure_grub.sh',
@@ -64,13 +65,15 @@ config = {
'configure_login.sh',
'configure_networking.sh',
'configure_acpid.sh',
+ # turning it into a systemvm
'install_systemvm_packages.sh',
- 'configure_systemvm_services.sh',
'configure_conntrack.sh',
+ 'configure_systemvm_services.sh',
+ # cleanup & space-saving
'cleanup.sh',
'zerodisk.sh'
],
- :postinstall_timeout => '10000'
+ :postinstall_timeout => '1200'
}
config.merge! architectures[arch.to_sym]