Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,6 @@ deployment_updater:

staging:
timeout_in_seconds: <%= link("cloud_controller_internal").p("cc.staging_timeout_in_seconds") %>
auth:
user: <%= link("cloud_controller_internal").p("cc.staging_upload_user") %>
password: <%= yaml_escape(link("cloud_controller_internal").p("cc.staging_upload_password")) %>

default_health_check_timeout: <%= link("cloud_controller_internal").p("cc.default_health_check_timeout") %>
maximum_health_check_timeout: <%= link("cloud_controller_internal").p("cc.maximum_health_check_timeout") %>
Expand Down
5 changes: 0 additions & 5 deletions jobs/cloud_controller_clock/spec
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,6 @@ properties:
default: 60
description: "Default health check timeout (in seconds) that can be set for the app"

cc.staging_upload_user:
description: "User name used to access internal endpoints of Cloud Controller to upload files when staging"
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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,6 @@ uaa:
# App staging parameters
staging:
timeout_in_seconds: <%= p("cc.staging_timeout_in_seconds") %>
auth:
user: <%= p("cc.staging_upload_user") %>
password: <%= yaml_escape(p("cc.staging_upload_password")) %>

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

Expand Down
7 changes: 0 additions & 7 deletions jobs/cloud_controller_ng/spec
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ provides:
- cc.resource_pool.resource_directory_key
- cc.stacks
- cc.staging_timeout_in_seconds
- cc.staging_upload_password
- cc.staging_upload_user
- cc.statsd_host
- cc.statsd_port
- cc.enable_statsd_metrics
Expand Down Expand Up @@ -464,11 +462,6 @@ properties:
If a stack in this list exists in the database, the Cloud Controller bootstrap VM will fail to start.
The only exception to this behavior occurs when the deprecated stack is explicitly listed in cc.stacks.

cc.staging_upload_user:
description: "User name used to access internal endpoints of Cloud Controller to upload files when staging"
cc.staging_upload_password:
description: "User's password used to access internal endpoints of Cloud Controller to upload files when staging"

cc.quota_definitions:
description: "Hash of default quota definitions to be seeded. This property can be used to add quotas with subsequent deploys, but not to update existing ones."
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,6 @@ staging:
minimum_staging_memory_mb: <%= p("cc.minimum_staging_memory_mb") %>
minimum_staging_disk_mb: <%= p("cc.minimum_staging_disk_mb") %>
minimum_staging_file_descriptor_limit: <%= p("cc.staging_file_descriptor_limit") %>
auth:
user: <%= p("cc.staging_upload_user") %>
password: <%= yaml_escape(p("cc.staging_upload_password")) %>

default_health_check_timeout: <%= p("cc.default_health_check_timeout") %>
maximum_health_check_timeout: <%= p("cc.maximum_health_check_timeout") %>
Expand Down
4 changes: 0 additions & 4 deletions jobs/cloud_controller_worker/spec
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,6 @@ properties:
description: "Maximum health check timeout (in seconds) that can be set for the app"
cc.jobs.priorities:
description: "List of hashes containing delayed jobs 'display_name' and its desired priority. This will overwrite the default priority of ccng"
cc.staging_upload_user:
description: "User name used to access internal endpoints of Cloud Controller to upload files when staging"
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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@ uaa:
# App staging parameters
staging:
timeout_in_seconds: <%= p("cc.staging_timeout_in_seconds") %>
auth:
user: <%= p("cc.staging_upload_user") %>
password: <%= yaml_escape(p("cc.staging_upload_password")) %>

default_health_check_timeout: <%= p("cc.default_health_check_timeout") %>
maximum_health_check_timeout: <%= p("cc.maximum_health_check_timeout") %>
Expand Down
4 changes: 0 additions & 4 deletions spec/cc_deployment_updater/cc_deployment_updater_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ module Test
'cc' => {

'db_logging_level' => 100,
'staging_upload_user' => 'staging_user',
'staging_upload_password' => 'hunter2',
'database_encryption' => {
'experimental_pbkdf2_hmac_iterations' => 123,
'skip_validation' => false,
Expand Down Expand Up @@ -64,8 +62,6 @@ module Test
'external_protocol' => 'https',
'external_host' => 'api',
'staging_timeout_in_seconds' => 900,
'staging_upload_user' => 'staging_user',
'staging_upload_password' => 'staging_user_password',
'default_health_check_timeout' => 60,
'maximum_health_check_timeout' => 180,
'resource_pool' => {
Expand Down
2 changes: 0 additions & 2 deletions spec/cloud_controller_clock/cloud_controller_clock_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ module Test
'cc' => {

'db_logging_level' => 100,
'staging_upload_user' => 'staging_user',
'staging_upload_password' => 'hunter2',
'database_encryption' => {
'experimental_pbkdf2_hmac_iterations' => 123,
'skip_validation' => false,
Expand Down
2 changes: 0 additions & 2 deletions spec/cloud_controller_ng/cloud_controller_ng_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ module Test
'stacks' =>
[{ 'description' => 'Cloud Foundry Linux-based filesystem',
'name' => 'cflinuxfs4' }],
'staging_upload_password' => '((cc_staging_upload_password))',
'staging_upload_user' => 'staging_user',
'temporary_enable_v2' => false },
'ccdb' =>
{ 'databases' => [{ 'name' => 'cloud_controller', 'tag' => 'cc' }],
Expand Down
2 changes: 0 additions & 2 deletions spec/cloud_controller_worker/cloud_controller_worker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ module Test
'cc' => {

'db_logging_level' => 100,
'staging_upload_user' => 'staging_user',
'staging_upload_password' => 'hunter2',
'database_encryption' => {
'experimental_pbkdf2_hmac_iterations' => 123,
'skip_validation' => false,
Expand Down
Loading