lib/bosh-bootstrap/microbosh_providers/openstack.rb in bosh-bootstrap-0.16.2 vs lib/bosh-bootstrap/microbosh_providers/openstack.rb in bosh-bootstrap-0.17.0
- old
+ new
@@ -2,11 +2,11 @@
module Bosh::Bootstrap::MicroboshProviders
class OpenStack < Base
def to_hash
- super.deep_merge({
+ data = super.deep_merge({
"network"=>network_configuration,
"resources"=>
{"persistent_disk"=>persistent_disk,
"cloud_properties"=>resources_cloud_properties},
"cloud"=>
@@ -21,9 +21,13 @@
{"director"=>
{"max_threads"=>3},
"hm"=>{"resurrector_enabled" => true},
"ntp"=>["0.north-america.pool.ntp.org","1.north-america.pool.ntp.org"]}}
})
+ if proxy?
+ data["apply_spec"]["properties"]["director"]["env"] = proxy
+ end
+ data
end
# For Nova/Floating IP:
# network:
# type: dynamic