lib/bosh-bootstrap/microbosh_providers/openstack.rb in bosh-bootstrap-0.16.1 vs lib/bosh-bootstrap/microbosh_providers/openstack.rb in bosh-bootstrap-0.16.2
- old
+ new
@@ -85,18 +85,23 @@
# TODO Allow discovery of an appropriate OpenStack flavor with 2+CPUs, 3+G RAM
def resources_cloud_properties
{"instance_type"=>"m1.medium"}
end
+ def provider_state_timeout
+ settings.exists?("provider") && settings.provider.exists?("state_timeout") ? settings.provider.state_timeout : 300
+ end
+
def cloud_properties
{
"auth_url"=>settings.provider.credentials.openstack_auth_url,
"username"=>settings.provider.credentials.openstack_username,
"api_key"=>settings.provider.credentials.openstack_api_key,
"tenant"=>settings.provider.credentials.openstack_tenant,
"region"=>region,
"default_security_groups"=>security_groups,
"default_key_name"=>microbosh_name,
+ "state_timeout"=>provider_state_timeout,
"private_key"=>private_key_path,
# TODO: Only ignore SSL verification if requested by user
"connection_options"=>{
"ssl_verify_peer"=>false
},