torpedo.rb in torpedo-1.0.11

- old
+ new

@@ -2,13 +2,13 @@
 require 'torpedo/config'
 
 configs = Torpedo::Config.load_configs
 
 SSH_TIMEOUT=(configs['ssh_timeout'] || 30).to_i
-TEST_SSH=configs['test_ssh'] || true
+TEST_SSH=configs.fetch('test_ssh', true)
 PING_TIMEOUT=(configs['ping_timeout'] || 60).to_i
-TEST_PING=configs['test_ping'] || true
+TEST_PING=configs.fetch('test_ping', true)
 SERVER_BUILD_TIMEOUT=(configs['server_build_timeout'] || 60).to_i
 SSH_PRIVATE_KEY=configs['ssh_private_key'] || ENV['HOME'] + "/.ssh/id_rsa"
 SSH_PUBLIC_KEY=configs['ssh_public_key'] || ENV['HOME'] + "/.ssh/id_rsa.pub"
 TEST_CREATE_IMAGE=configs['test_create_image'] || false
 TEST_REBUILD_SERVER=configs['test_rebuild_server'] || false
@@ -16,9 +16,11 @@
 TEST_HARD_REBOOT_SERVER=configs['test_hard_reboot_server'] || false
 TEST_RESIZE_SERVER=configs['test_resize_server'] || false
 TEST_REVERT_RESIZE_SERVER=configs['test_revert_resize_server'] || false
 TEST_ADMIN_PASSWORD=configs['test_admin_password'] || false
 TEST_HOSTID_ON_RESIZE=configs['test_hostid_on_resize'] || false
+CLEAN_UP_SERVERS=configs.fetch('clean_up_servers', true)
+CLEAN_UP_IMAGES=configs.fetch('clean_up_images', true)
 KEYPAIR=configs['keypair']
 KEYNAME=configs['keyname']
 
 IMAGE_REF=configs['image_ref']
 IMAGE_NAME=configs['image_name']