Permalink
Browse files

Add options to disable ssh and ping tests.

  • Loading branch information...
Dan Prince
Dan Prince committed Nov 16, 2011
1 parent e949c54 commit 357dfca011b61c0beaf73a0f3dee023237cd24c3
Showing with 12 additions and 3 deletions.
  1. +3 −0 CHANGELOG
  2. +4 −0 README.md
  3. +1 −1 VERSION
  4. +2 −0 lib/torpedo.rb
  5. +2 −2 lib/torpedo/compute/servers.rb
View
@@ -1,3 +1,6 @@
+* Wed Nov 16 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.9
+ -Add options to disable ssh and ping tests.
+
* Fri Nov 11 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.8
-Use the latest version of the openstack-compute unless a specific
version is specified in the config file.
View
@@ -37,6 +37,10 @@ Installation
#flavor_name:
flavor_ref: 4
+ # SSH/PING test options
+ #test_ssh: true
+ #test_ping: true
+
# SSH KEYS (used to verify installations which support personalities)
#ssh_private_key: <your home dir>/.ssh/id_rsa
#ssh_public_key: <your home dir>/.ssh/id_rsa.pub
View
@@ -1 +1 @@
-1.0.8
+1.0.9
View
@@ -4,7 +4,9 @@
configs = Torpedo::Config.load_configs
SSH_TIMEOUT=(configs['ssh_timeout'] || 30).to_i
+TEST_SSH=configs['test_ssh'] || true
PING_TIMEOUT=(configs['ping_timeout'] || 60).to_i
+TEST_PING=configs['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"
@@ -95,8 +95,8 @@ def check_server(server, image_ref, flavor_ref, check_status="ACTIVE")
# lookup the first IPv4 address and use that for verification
v4_addresses = server.addresses[:public].reject {|addr| addr.version != 4}
- ping_test(v4_addresses[0].address)
- ssh_test(v4_addresses[0].address)
+ ping_test(v4_addresses[0].address) if TEST_PING
+ ssh_test(v4_addresses[0].address) if TEST_SSH
server

0 comments on commit 357dfca

Please sign in to comment.