Skip to content
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
1 change: 1 addition & 0 deletions jobs/cloud_controller_ng/spec
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ provides:
- cc.statsd_port
- cc.enable_statsd_metrics
- cc.system_hostnames
- cc.temporary_enable_v2
- cc.tls_port
- cc.uaa.client_timeout
- cc.internal_route_vip_range
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ db: &db

<% system_domain = p("system_domain") %>

temporary_enable_v2: <%= link("cloud_controller_internal").p("cc.temporary_enable_v2") %>

uaa:
internal_url: <%= "https://#{p("cc.uaa.internal_url")}:#{p("uaa.ssl.port")}" %>
ca_file: /var/vcap/jobs/cloud_controller_worker/config/certs/uaa_ca.crt
Expand Down
11 changes: 10 additions & 1 deletion spec/cloud_controller_worker/cloud_controller_worker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,12 @@ module Test
'jobs' => {
'enable_dynamic_job_priorities' => false
},
'app_log_revision' => true
'app_log_revision' => true,
'temporary_enable_v2' => true
}
}
end

let(:cloud_controller_internal_link) do
Link.new(name: 'cloud_controller_internal', properties:, instances: [LinkInstance.new(address: 'default_app_ssh_access')])
end
Expand Down Expand Up @@ -258,6 +260,13 @@ module Test
end
end
end

describe 'enable v2 API' do
it 'is by default true' do
template_hash = YAML.safe_load(template.render(manifest_properties, consumes: links))
expect(template_hash['temporary_enable_v2']).to be(true)
end
end
end
end
end
Expand Down