Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[finishes #45642021] - director uses new style blobstore properties

  • Loading branch information...
commit 0a33efb2c50e70a1f61a79085c0d6f46402375e5 1 parent e5730d9
Alex Jackson and Martin Englund authored
View
8 director/config/bosh-director.yml
@@ -12,8 +12,8 @@ db:
max_connections: 32
pool_timeout: 10
blobstore:
- plugin: simple
- properties:
+ provider: simple
+ options:
endpoint: http://127.0.0.1:9999
user: admin
password: admin
@@ -24,8 +24,8 @@ cloud:
ntp:
- ntp01.las01.emcatmos.com
blobstore:
- plugin: simple
- properties:
+ provider: simple
+ options:
endpoint: http://127.0.0.1:9999
user: admin
password: admin
View
12 director/lib/director/config.rb
@@ -146,9 +146,9 @@ def configure_db(db_config)
def blobstore
@lock.synchronize do
if @blobstore.nil?
- plugin = @blobstore_options["plugin"]
- properties = @blobstore_options["properties"]
- @blobstore = Bosh::Blobstore::Client.create(plugin, properties)
+ provider = @blobstore_options["provider"]
+ options = @blobstore_options["options"]
+ @blobstore = Bosh::Blobstore::Client.create(provider, options)
end
end
@blobstore
@@ -157,9 +157,9 @@ def blobstore
def compiled_package_cache_blobstore
@lock.synchronize do
if @compiled_package_cache_blobstore.nil? && use_compiled_package_cache?
- plugin = @compiled_package_cache_options["provider"]
- properties = @compiled_package_cache_options["options"]
- @compiled_package_cache_blobstore = Bosh::Blobstore::Client.create(plugin, properties)
+ provider = @compiled_package_cache_options["provider"]
+ options = @compiled_package_cache_options["options"]
+ @compiled_package_cache_blobstore = Bosh::Blobstore::Client.create(provider, options)
end
end
@compiled_package_cache_blobstore
View
8 director/spec/assets/test-cpi-config.yml
@@ -16,8 +16,8 @@ db:
max_connections: 32
pool_timeout: 10
blobstore:
- plugin: simple
- properties:
+ provider: simple
+ options:
endpoint: http://127.0.0.1
user: admin
password:
@@ -43,8 +43,8 @@ cloud:
- ntp01.las01.emcatmos.com
- ntp02.las01.emcatmos.com
blobstore:
- plugin: simple
- properties:
+ provider: simple
+ options:
endpoint: http:localhost:7777
user: vcap
password: vcap
View
4 director/spec/assets/test-director-config.yml
@@ -16,8 +16,8 @@ db:
max_connections: 32
pool_timeout: 10
blobstore:
- plugin: simple
- properties:
+ provider: simple
+ options:
endpoint: http://127.0.0.1
user: admin
password:
View
4 director/spec/functional/director_controller_spec.rb
@@ -16,8 +16,8 @@
test_config = YAML.load(spec_asset("test-director-config.yml"))
test_config["dir"] = @temp_dir
test_config["blobstore"] = {
- "plugin" => "local",
- "properties" => {"blobstore_path" => @blobstore_dir}
+ "provider" => "local",
+ "options" => {"blobstore_path" => @blobstore_dir}
}
BD::Config.configure(test_config)
end
View
4 director/spec/unit/api_controller_spec.rb
@@ -16,8 +16,8 @@
test_config = YAML.load(spec_asset("test-director-config.yml"))
test_config["dir"] = @temp_dir
test_config["blobstore"] = {
- "plugin" => "local",
- "properties" => {"blobstore_path" => @blobstore_dir}
+ "provider" => "local",
+ "options" => {"blobstore_path" => @blobstore_dir}
}
BD::Config.configure(test_config)
basic_authorize "admin", "admin"
View
6 release/jobs/director/templates/director.yml.erb
@@ -42,9 +42,9 @@ dns:
pool_timeout: 10
<% end %>
blobstore:
- plugin: <%= p('blobstore.plugin') %>
- properties:
-<% if p('blobstore.plugin') == "s3" %>
+ provider: <%= p('blobstore.provider') %>
+ options:
+<% if p('blobstore.provider') == "s3" %>
bucket_name: <%= p('blobstore.bucket_name') %>
access_key_id: <%= p('blobstore.access_key_id') %>
secret_access_key: <%= p('blobstore.secret_access_key') %>
View
10 spec/assets/director_test.yml
@@ -19,8 +19,14 @@ dns:
max_connections: 32
pool_timeout: 10
blobstore:
- plugin: simple
- properties:
+ provider: simple
+ options:
+ endpoint: http://127.0.0.1:9590
+ user: bs_admin
+ password: bs_pass
+compiled_package_cache:
+ provider: simple
+ options:
endpoint: http://127.0.0.1:9590
user: bs_admin
password: bs_pass
Please sign in to comment.
Something went wrong with that request. Please try again.