Skip to content

Commit de71cea

Browse files
authored
Blobstore provider can be empty, take that into account when reading from link (#584)
1 parent 917d17a commit de71cea

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,9 @@ resource_pool:
171171
minimum_size: <%= link("cloud_controller_internal").p("cc.resource_pool.minimum_size") %>
172172
maximum_size: <%= link("cloud_controller_internal").p("cc.resource_pool.maximum_size") %>
173173
resource_directory_key: <%= link("cloud_controller_internal").p("cc.resource_pool.resource_directory_key") %>
174-
blobstore_provider: <%= link("cloud_controller_internal").p("cc.resource_pool.blobstore_provider") %>
174+
<% if (rp_provider = link("cloud_controller_internal").p("cc.resource_pool.blobstore_provider", nil)) %>
175+
blobstore_provider: <%= rp_provider %>
176+
<% end %>
175177
connection_config: <%= link("cloud_controller_internal").p("cc.resource_pool.connection_config", {}).to_json %>
176178
<% link("cloud_controller_internal").if_p("cc.resource_pool.cdn") do %>
177179
cdn:
@@ -195,7 +197,9 @@ packages:
195197
ca_cert_path: "/var/vcap/jobs/cc_deployment_updater/config/certs/packages_ca_cert.pem"
196198
<% end %>
197199
app_package_directory_key: <%= link("cloud_controller_internal").p("cc.packages.app_package_directory_key") %>
198-
blobstore_provider: <%= link("cloud_controller_internal").p("cc.packages.blobstore_provider") %>
200+
<% if (pk_provider = link("cloud_controller_internal").p("cc.packages.blobstore_provider", nil)) %>
201+
blobstore_provider: <%= pk_provider %>
202+
<% end %>
199203
connection_config: <%= link("cloud_controller_internal").p("cc.packages.connection_config", {}).to_json %>
200204
max_package_size: <%= link("cloud_controller_internal").p("cc.packages.max_package_size") %>
201205
<% link("cloud_controller_internal").if_p("cc.packages.cdn") do %>
@@ -221,7 +225,9 @@ droplets:
221225
ca_cert_path: "/var/vcap/jobs/cc_deployment_updater/config/certs/droplets_ca_cert.pem"
222226
<% end %>
223227
droplet_directory_key: <%= link("cloud_controller_internal").p("cc.droplets.droplet_directory_key") %>
224-
blobstore_provider: <%= link("cloud_controller_internal").p("cc.droplets.blobstore_provider") %>
228+
<% if (dp_provider = link("cloud_controller_internal").p("cc.droplets.blobstore_provider", nil)) %>
229+
blobstore_provider: <%= dp_provider %>
230+
<% end %>
225231
connection_config: <%= link("cloud_controller_internal").p("cc.droplets.connection_config", {}).to_json %>
226232
<% link("cloud_controller_internal").if_p("cc.droplets.cdn") do %>
227233
cdn:
@@ -245,7 +251,9 @@ buildpacks:
245251
ca_cert_path: "/var/vcap/jobs/cc_deployment_updater/config/certs/buildpacks_ca_cert.pem"
246252
<% end %>
247253
buildpack_directory_key: <%= link("cloud_controller_internal").p("cc.buildpacks.buildpack_directory_key") %>
248-
blobstore_provider: <%= link("cloud_controller_internal").p("cc.buildpacks.blobstore_provider") %>
254+
<% if (bp_provider = link("cloud_controller_internal").p("cc.buildpacks.blobstore_provider", nil)) %>
255+
blobstore_provider: <%= bp_provider %>
256+
<% end %>
249257
connection_config: <%= link("cloud_controller_internal").p("cc.buildpacks.connection_config", {}).to_json %>
250258
<% link("cloud_controller_internal").if_p("cc.buildpacks.cdn") do %>
251259
cdn:

0 commit comments

Comments
 (0)