Skip to content
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.

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

Remove cc_internal_api_user and cc_internal_api_password #286

Merged
Merged
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
6 changes: 0 additions & 6 deletions jobs/cloud_controller_clock/spec
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,6 @@ properties:
default: "api"
description: "Host part of the cloud_controller api URI, will be joined with value of 'domain'"

cc.internal_api_user:
default: "internal_user"
description: "User name used by Diego to access internal endpoints"
cc.internal_api_password:
description: "Password used by Diego to access internal endpoints"

cc.logging_level:
default: "info"
description: "Log level for cc. Valid levels are listed here: https://github.com/cloudfoundry/steno#log-levels."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ pending_builds:
diego_sync:
frequency_in_seconds: <%= p("cc.diego_sync.frequency_in_seconds") %>

internal_api:
auth_user: <%= p("cc.internal_api_user") %>
auth_password: <%= yaml_escape(p("cc.internal_api_password")) %>

nginx:
use_nginx: true
Expand Down
6 changes: 0 additions & 6 deletions jobs/cloud_controller_ng/spec
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,6 @@ properties:
default: "/var/vcap/data/cloud_controller_ng/diagnostics"
description: "The directory where operator requested diagnostic files should be placed"

cc.internal_api_user:
default: "internal_user"
description: "User name used by Diego to access internal endpoints"
cc.internal_api_password:
description: "Password used by Diego to access internal endpoints"

cc.min_cli_version:
description: "Minimum version of the CF CLI to work with the API."
default: ~
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ instance_file_descriptor_limit: <%= p("cc.instance_file_descriptor_limit") %>

request_timeout_in_seconds: <%= p("request_timeout_in_seconds") %>

internal_api:
auth_user: <%= p("cc.internal_api_user") %>
auth_password: <%= yaml_escape(p("cc.internal_api_password")) %>

nginx:
use_nginx: true
instance_socket: "/var/vcap/data/cloud_controller_ng/cloud_controller.sock"
Expand Down
6 changes: 0 additions & 6 deletions jobs/cloud_controller_worker/spec
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@ properties:
default: "api"
description: "Host part of the cloud_controller api URI, will be joined with value of 'domain'"

cc.internal_api_user:
default: "internal_user"
description: "User name used by Diego to access internal endpoints"
cc.internal_api_password:
description: "Password used by Diego to access internal endpoints"

cc.logging_level:
default: "info"
description: "Log level for cc. Valid levels are listed here: https://github.com/cloudfoundry/steno#log-levels."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ instance_file_descriptor_limit: <%= p("cc.instance_file_descriptor_limit") %>

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

internal_api:
auth_user: <%= p("cc.internal_api_user") %>
auth_password: <%= yaml_escape(p("cc.internal_api_password")) %>

nginx:
use_nginx: true
instance_socket: "/var/vcap/sys/run/cloud_controller_worker/cloud_controller.sock"
Expand Down
1 change: 0 additions & 1 deletion spec/cloud_controller_ng/cloud_controller_ng_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ module Bosh::Template::Test
{ 'name' => 'python_buildpack', 'package' => 'python-buildpack' },
{ 'name' => 'php_buildpack', 'package' => 'php-buildpack' },
{ 'name' => 'binary_buildpack', 'package' => 'binary-buildpack' }],
'internal_api_password' => '((cc_internal_api_password))',
'mutual_tls' =>
{ 'ca_cert' => '((service_cf_internal_ca.certificate))',
'private_key' => '((cc_tls.private_key))',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module Bosh::Template::Test
'system_domain' => 'brook-sentry.capi.land',

'cc' => {
'internal_api_password' => '((cc_internal_api_password))',

'db_logging_level' => 100,
'staging_upload_user' => 'staging_user',
Expand Down