Skip to content

storage_cli_optional_flags config parameter #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johha merged 3 commits into from
Jan 26, 2026
Merged

storage_cli_optional_flags config parameter #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fa67b8
feat: config parameter 'storage_cli_optional_flags' added in cloud_co…
serdarozerr Jan 21, 2026
1f26189
fix: new parameter added into test properties
serdarozerr Jan 21, 2026
c00b181
fix: optional parameters are checked with if statement
serdarozerr Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@ storage_cli_config_file_droplets: /var/vcap/jobs/cc_deployment_updater/config/st
storage_cli_config_file_buildpacks: /var/vcap/jobs/cc_deployment_updater/config/storage_cli_config_buildpacks.json
storage_cli_config_file_packages: /var/vcap/jobs/cc_deployment_updater/config/storage_cli_config_packages.json
storage_cli_config_file_resource_pool: /var/vcap/jobs/cc_deployment_updater/config/storage_cli_config_resource_pool.json
<% link("cloud_controller_internal").if_p('cc.storage_cli_optional_flags') do %>
storage_cli_optional_flags: <%= link("cloud_controller_internal").p("cc.storage_cli_optional_flags") %>
<% end %>

resource_pool:
blobstore_type: <%= link("cloud_controller_internal").p("cc.resource_pool.blobstore_type") %>
Expand Down
3 changes: 3 additions & 0 deletions jobs/cloud_controller_clock/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ properties:
cc.staging_upload_password:
description: "User's password used to access internal endpoints of Cloud Controller to upload files when staging"

cc.storage_cli_optional_flags:
description: "Storage Cli extra flags string"

cc.resource_pool.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM', 'AWS', 'aliyun', 'webdav', 'Google']"
default: ~
Expand Down
4 changes: 4 additions & 0 deletions jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ storage_cli_config_file_droplets: /var/vcap/jobs/cloud_controller_clock/config/s
storage_cli_config_file_buildpacks: /var/vcap/jobs/cloud_controller_clock/config/storage_cli_config_buildpacks.json
storage_cli_config_file_packages: /var/vcap/jobs/cloud_controller_clock/config/storage_cli_config_packages.json
storage_cli_config_file_resource_pool: /var/vcap/jobs/cloud_controller_clock/config/storage_cli_config_resource_pool.json
<% if_p('cc.storage_cli_optional_flags') do %>
storage_cli_optional_flags: <%= p("cc.storage_cli_optional_flags") %>
<% end %>


jobs:
global:
Expand Down
4 changes: 4 additions & 0 deletions jobs/cloud_controller_ng/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ provides:
- cc.packages.connection_config
- cc.droplets.connection_config
- cc.buildpacks.connection_config
- cc.storage_cli_optional_flags

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

cc.storage_cli_optional_flags:
description: "Storage Cli extra flags string"

cc.resource_pool.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM', 'AWS', 'aliyun', 'webdav', 'Google']"
default: ~
Expand Down
3 changes: 3 additions & 0 deletions jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,9 @@ storage_cli_config_file_droplets: /var/vcap/jobs/cloud_controller_ng/config/stor
storage_cli_config_file_buildpacks: /var/vcap/jobs/cloud_controller_ng/config/storage_cli_config_buildpacks.json
storage_cli_config_file_packages: /var/vcap/jobs/cloud_controller_ng/config/storage_cli_config_packages.json
storage_cli_config_file_resource_pool: /var/vcap/jobs/cloud_controller_ng/config/storage_cli_config_resource_pool.json
<% if_p('cc.storage_cli_optional_flags') do %>
storage_cli_optional_flags: <%= p("cc.storage_cli_optional_flags") %>
<% end %>

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

Expand Down
3 changes: 3 additions & 0 deletions jobs/cloud_controller_worker/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ properties:
cc.staging_upload_password:
description: "User's password used to access internal endpoints of Cloud Controller to upload files when staging"

cc.storage_cli_optional_flags:
description: "Storage Cli extra flags string"

cc.resource_pool.blobstore_provider:
description: "The provider of blobstore storage cli to use. Valid values: ['AzureRM', 'AWS', 'aliyun', 'webdav', 'Google']"
default: ~
Expand Down
3 changes: 3 additions & 0 deletions jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ storage_cli_config_file_droplets: /var/vcap/jobs/cloud_controller_worker/config/
storage_cli_config_file_buildpacks: /var/vcap/jobs/cloud_controller_worker/config/storage_cli_config_buildpacks.json
storage_cli_config_file_packages: /var/vcap/jobs/cloud_controller_worker/config/storage_cli_config_packages.json
storage_cli_config_file_resource_pool: /var/vcap/jobs/cloud_controller_worker/config/storage_cli_config_resource_pool.json
<% if_p('cc.storage_cli_optional_flags') do %>
storage_cli_optional_flags: <%= p("cc.storage_cli_optional_flags") %>
<% end %>

resource_pool:
blobstore_type: <%= p("cc.resource_pool.blobstore_type") %>
Expand Down