commit e06f58646333d35ad3780d099c8ff2d2335dabb8
author jan kaufman <jan.kaufman@tcpcloud.eu> Wed Aug 12 23:46:11 2015 +0200
committer jan kaufman <jan.kaufman@tcpcloud.eu> Wed Aug 12 23:46:11 2015 +0200
tree 4b7fe2f65668ff855ab7008a16f8ec916622b347
parent a9496710c815b45bd05e23ace5d6b93f9d269e8b

move timeouts into main config

ubuntu-14.04/configs/cloud/cloud.cfg

diff --git a/ubuntu-14.04/configs/cloud/cloud.cfg b/ubuntu-14.04/configs/cloud/cloud.cfg
index 929840e..962c91a 100644
--- a/ubuntu-14.04/configs/cloud/cloud.cfg
+++ b/ubuntu-14.04/configs/cloud/cloud.cfg
@@ -59,3 +59,12 @@
  - phone-home
  - final-message
  - power-state-change
+
+datasource:
+    Ec2:
+      timeout: 5 # (defaults to 50 seconds)
+      max_wait: 10 # (defaults to 120 seconds)
+    OpenStack:
+      timeout: 5 # (defaults to 50 seconds)
+      max_wait: 10 # (defaults to 120 seconds)
+