Consume cf-cli as colocated job.

[#165899636]

jobs/broker-deregistrar/spec

@@ -1,7 +1,5 @@
 ---
 name: broker-deregistrar
-packages:
-- cf-cli-6-linux
 templates:
   errand.sh.erb: bin/run
 properties:

jobs/broker-registrar/spec

@@ -1,7 +1,5 @@
 ---
 name: broker-registrar
-packages:
-- cf-cli-6-linux
 templates:
   errand.sh.erb: bin/run
 properties:

jobs/cleanup-metadata-if-dedicated-disabled/spec

@@ -1,7 +1,5 @@
 ---
 name: cleanup-metadata-if-dedicated-disabled
-packages:
-- cf-cli-6-linux
 templates:
   errand.sh.erb: bin/run
 properties:
@@ -18,4 +16,4 @@ properties:
     description: 'Number of provisioned dedicated instances'
   redis.broker.dedicated_vm_plan_id:
     description: Dedicated-VM plan id displayed in the catalog metadata
-    default: 74E8984C-5F8C-11E4-86BE-07807B3B2589
+    default: 74E8984C-5F8C-11E4-86BE-07807B3B2589

jobs/deprecate-dedicated-vm-plan/spec

@@ -1,7 +1,5 @@
 ---
 name: deprecate-dedicated-vm-plan
-packages:
-- cf-cli-6-linux
 templates:
   errand.sh.erb: bin/run
 properties:

jobs/smoke-tests/spec

@@ -8,7 +8,6 @@ packages:
 - go
 - ginkgo
 - cf-redis-smoke-tests
-- cf-cli-6-linux
 
 consumes:
 - name: redis_broker

manifest/deployment.yml

@@ -29,6 +29,8 @@ instance_groups:
   jobs:
   - name: cf-redis-broker
     release: cf-redis
+  - name: cf-cli-6-linux
+    release: cf-cli
   - name: route_registrar
     release: routing
     consumes:
@@ -119,6 +121,8 @@ releases:
   version: ((bpm_version))
 - name: syslog
   version: ((syslog_version))
+- name: cf-cli
+  version: latest
 
 stemcells:
 - alias: default