diff --git a/jobs/cf-redis-broker/spec b/jobs/cf-redis-broker/spec index 5fec776..65ddfec 100644 --- a/jobs/cf-redis-broker/spec +++ b/jobs/cf-redis-broker/spec @@ -143,6 +143,12 @@ properties: redis.broker.start_redis_timeout: description: Maximum wait time in seconds for Redis to start up default: 600 + redis.broker.shared_min_port: + description: The preferred lower port range to allocate for shared instances (e.g. "30000"). If no free port is available within this range, the service instance creation request will fail. + default: 1024 + redis.broker.shared_max_port: + description: The preferred upper port range to allocate for shared instances (e.g. "40000"). If no free port is available within the preferred range, the service instance creation request will fail. + default: 65535 redis.broker.service_instance_limit: description: The maximum number of instances allowed redis.broker.auth.username: diff --git a/jobs/cf-redis-broker/templates/broker.yml.erb b/jobs/cf-redis-broker/templates/broker.yml.erb index 5a38c1e..655a318 100644 --- a/jobs/cf-redis-broker/templates/broker.yml.erb +++ b/jobs/cf-redis-broker/templates/broker.yml.erb @@ -36,6 +36,8 @@ redis: long_description: <%= p('redis.broker.long_description') %> description: <%= p('redis.broker.description') %> icon_image: <%= p('redis.broker.icon_image') %> + shared_min_port: <%= p('redis.broker.shared_min_port') %> + shared_max_port: <%= p('redis.broker.shared_max_port') %> dedicated: nodes: <%= p('redis.broker.dedicated_nodes') %> port: <%= p('redis.broker.dedicated_port') %> diff --git a/templates/sample_stubs/meta-aws.yml b/templates/sample_stubs/meta-aws.yml index 82283c3..9599424 100644 --- a/templates/sample_stubs/meta-aws.yml +++ b/templates/sample_stubs/meta-aws.yml @@ -34,6 +34,8 @@ meta: service_id: 7aba7e52-f61b-4263-9de1-14e9d11fb67d shared_vm_plan_id: 78bf886c-bc50-4f31-a03c-cb786a158286 dedicated_vm_plan_id: 48b35349-d3de-4e19-bc4a-66996ae07766 + shared_min_port: 1024 + shared_max_port: 65535 dedicated_plan: instance_count: 2 shared_plan: diff --git a/templates/sample_stubs/meta-openstack.yml b/templates/sample_stubs/meta-openstack.yml index fbf64e2..5ddfe53 100644 --- a/templates/sample_stubs/meta-openstack.yml +++ b/templates/sample_stubs/meta-openstack.yml @@ -35,6 +35,8 @@ meta: service_id: 7aba7e52-f61b-4263-9de1-14e9d11fb67d shared_vm_plan_id: 78bf886c-bc50-4f31-a03c-cb786a158286 dedicated_vm_plan_id: 48b35349-d3de-4e19-bc4a-66996ae07766 + shared_min_port: 1024 + shared_max_port: 65535 dedicated_plan: instance_count: 3 shared_plan: diff --git a/templates/stubs/cf-redis-jobs.yml b/templates/stubs/cf-redis-jobs.yml index 1d36667..8dcff4a 100644 --- a/templates/stubs/cf-redis-jobs.yml +++ b/templates/stubs/cf-redis-jobs.yml @@ -29,6 +29,8 @@ properties: name: (( .meta.redis.broker.name )) service_instance_limit: (( .meta.redis.shared_plan.instance_limit )) dedicated_nodes: (( base_jobs.dedicated-node.networks.redis_z1.static_ips )) + shared_min_port: (( .meta.redis.broker.shared_min_port )) + shared_max_port: (( .meta.redis.broker.shared_max_port )) maxmemory: (( .meta.redis.shared_plan.max_memory )) host: (( base_jobs.cf-redis-broker.networks.redis_z1.static_ips.[0] )) config_command: (( .meta.redis.config_command ))