diff --git a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb b/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb index 1d1fc5707d..4c2b37fb7a 100644 --- a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb +++ b/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb @@ -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") %> diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec index 0b3fff5211..5a7ae40dab 100644 --- a/jobs/cloud_controller_clock/spec +++ b/jobs/cloud_controller_clock/spec @@ -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: ~ diff --git a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb index d8fb7b56cd..7e5a29cc15 100644 --- a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb @@ -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: diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 9576a48131..98fac650ab 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -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 @@ -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: ~ diff --git a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb index 627ebf4f1d..f9261bc4ed 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -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") %> diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 4f2f1e8161..72d2a62fd9 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -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: ~ diff --git a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb index d582ed17ea..a081ce9859 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -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") %>