Skip to content

Commit 681d09e

Browse files
authored
storage_cli_optional_flags config parameter (#603)
* feat: config parameter 'storage_cli_optional_flags' added in cloud_controler_ng.yml config * fix: new parameter added into test properties * fix: optional parameters are checked with if statement
1 parent b733e34 commit 681d09e

7 files changed

Lines changed: 23 additions & 0 deletions

File tree

jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ storage_cli_config_file_droplets: /var/vcap/jobs/cc_deployment_updater/config/st
156156
storage_cli_config_file_buildpacks: /var/vcap/jobs/cc_deployment_updater/config/storage_cli_config_buildpacks.json
157157
storage_cli_config_file_packages: /var/vcap/jobs/cc_deployment_updater/config/storage_cli_config_packages.json
158158
storage_cli_config_file_resource_pool: /var/vcap/jobs/cc_deployment_updater/config/storage_cli_config_resource_pool.json
159+
<% link("cloud_controller_internal").if_p('cc.storage_cli_optional_flags') do %>
160+
storage_cli_optional_flags: <%= link("cloud_controller_internal").p("cc.storage_cli_optional_flags") %>
161+
<% end %>
159162

160163
resource_pool:
161164
blobstore_type: <%= link("cloud_controller_internal").p("cc.resource_pool.blobstore_type") %>

jobs/cloud_controller_clock/spec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ properties:
180180
cc.staging_upload_password:
181181
description: "User's password used to access internal endpoints of Cloud Controller to upload files when staging"
182182

183+
cc.storage_cli_optional_flags:
184+
description: "Storage Cli extra flags string"
185+
183186
cc.resource_pool.blobstore_provider:
184187
description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM', 'AWS', 'aliyun', 'webdav', 'Google']"
185188
default: ~

jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ storage_cli_config_file_droplets: /var/vcap/jobs/cloud_controller_clock/config/s
4848
storage_cli_config_file_buildpacks: /var/vcap/jobs/cloud_controller_clock/config/storage_cli_config_buildpacks.json
4949
storage_cli_config_file_packages: /var/vcap/jobs/cloud_controller_clock/config/storage_cli_config_packages.json
5050
storage_cli_config_file_resource_pool: /var/vcap/jobs/cloud_controller_clock/config/storage_cli_config_resource_pool.json
51+
<% if_p('cc.storage_cli_optional_flags') do %>
52+
storage_cli_optional_flags: <%= p("cc.storage_cli_optional_flags") %>
53+
<% end %>
54+
5155

5256
jobs:
5357
global:

jobs/cloud_controller_ng/spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ provides:
240240
- cc.packages.connection_config
241241
- cc.droplets.connection_config
242242
- cc.buildpacks.connection_config
243+
- cc.storage_cli_optional_flags
243244

244245
consumes:
245246
- name: database
@@ -521,6 +522,9 @@ properties:
521522
default: default
522523
description: "The name of the quota definition CC will fallback on for org and space limits from the list of quota definitions."
523524

525+
cc.storage_cli_optional_flags:
526+
description: "Storage Cli extra flags string"
527+
524528
cc.resource_pool.blobstore_provider:
525529
description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM', 'AWS', 'aliyun', 'webdav', 'Google']"
526530
default: ~

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,9 @@ storage_cli_config_file_droplets: /var/vcap/jobs/cloud_controller_ng/config/stor
309309
storage_cli_config_file_buildpacks: /var/vcap/jobs/cloud_controller_ng/config/storage_cli_config_buildpacks.json
310310
storage_cli_config_file_packages: /var/vcap/jobs/cloud_controller_ng/config/storage_cli_config_packages.json
311311
storage_cli_config_file_resource_pool: /var/vcap/jobs/cloud_controller_ng/config/storage_cli_config_resource_pool.json
312+
<% if_p('cc.storage_cli_optional_flags') do %>
313+
storage_cli_optional_flags: <%= p("cc.storage_cli_optional_flags") %>
314+
<% end %>
312315

313316
shared_isolation_segment_name: <%= p("cc.shared_isolation_segment_name") %>
314317

jobs/cloud_controller_worker/spec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ properties:
143143
cc.staging_upload_password:
144144
description: "User's password used to access internal endpoints of Cloud Controller to upload files when staging"
145145

146+
cc.storage_cli_optional_flags:
147+
description: "Storage Cli extra flags string"
148+
146149
cc.resource_pool.blobstore_provider:
147150
description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM', 'AWS', 'aliyun', 'webdav', 'Google']"
148151
default: ~

jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ storage_cli_config_file_droplets: /var/vcap/jobs/cloud_controller_worker/config/
159159
storage_cli_config_file_buildpacks: /var/vcap/jobs/cloud_controller_worker/config/storage_cli_config_buildpacks.json
160160
storage_cli_config_file_packages: /var/vcap/jobs/cloud_controller_worker/config/storage_cli_config_packages.json
161161
storage_cli_config_file_resource_pool: /var/vcap/jobs/cloud_controller_worker/config/storage_cli_config_resource_pool.json
162+
<% if_p('cc.storage_cli_optional_flags') do %>
163+
storage_cli_optional_flags: <%= p("cc.storage_cli_optional_flags") %>
164+
<% end %>
162165

163166
resource_pool:
164167
blobstore_type: <%= p("cc.resource_pool.blobstore_type") %>

0 commit comments

Comments
 (0)