Skip to content

Commit 67d7d61

Browse files
committed
Use empty string as fallback if storage_cli_optional_flags is not set isntead of nil
1 parent 13e06ce commit 67d7d61

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252

5353
cc_cfg = deep_merge_overwrite(cc_cfg, overrides)
5454

55+
if cc_cfg.key?("storage_cli_optional_flags")
56+
cc_cfg["storage_cli_optional_flags"] = cc_cfg["storage_cli_optional_flags"].to_s
57+
end
58+
5559
%w[resource_pool buildpacks packages droplets].each do |k|
5660
section = cc_cfg[k]
5761
next unless section.is_a?(Hash)
@@ -125,9 +129,6 @@
125129
'storage_cli_config_file_packages' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_packages.json',
126130
'storage_cli_config_file_droplets' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_droplets.json',
127131
)
128-
link("cloud_controller_internal").if_p("cc.storage_cli_optional_flags") do |flags|
129-
final["storage_cli_optional_flags"] = flags
130-
end
131132
end
132133

133134
deep_merge_without_overwrite(final, cc_cfg)

0 commit comments

Comments
 (0)