Merge pull request #979 from cloud-gov/iso-seg-devtools

Add isolated diego cells for devtools

Author: cweibel

bosh/opsfiles/scaling-development.yml

@@ -148,10 +148,10 @@
 
 
 # iso-segs
-#- type: replace
-#  path: /instance_groups/name=diego-cell-iso-seg1/vm_type
-#  value: r6i.4xlarge
-#
-#- type: replace
-#  path: /instance_groups/name=diego-cell-iso-seg1/instances
-#  value: 2
+- type: replace
+  path: /instance_groups/name=diego-cell-iso-seg-devtools/vm_type
+  value: t3.large
+
+- type: replace
+  path: /instance_groups/name=diego-cell-iso-seg-devtools/instances
+  value: 1

bosh/opsfiles/scaling-production.yml

@@ -150,3 +150,12 @@
 - type: replace
   path: /instance_groups/name=rotate-cc-database-key/vm_type
   value: t3.medium
+
+# iso-segs
+- type: replace
+  path: /instance_groups/name=diego-cell-iso-seg-devtools/vm_type
+  value: r6i.2xlarge
+
+- type: replace
+  path: /instance_groups/name=diego-cell-iso-seg-devtools/instances
+  value: 3

bosh/opsfiles/scaling-staging.yml

@@ -146,3 +146,12 @@
 - type: replace
   path: /instance_groups/name=rotate-cc-database-key/vm_type
   value: t3.medium
+
+# iso-segs
+- type: replace
+  path: /instance_groups/name=diego-cell-iso-seg-devtools/vm_type
+  value: r6i.2xlarge
+
+- type: replace
+  path: /instance_groups/name=diego-cell-iso-seg-devtools/instances
+  value: 1

ci/pipeline.yml

@@ -51,7 +51,7 @@ jobs:
         image: general-task
         file: cf-manifests/ci/create-diego-cell-iso-seg.yml
         params:
-          ISO_SEG_NAMES: "" #((names_of_iso_segs_development))    # Value in credhub
+          ISO_SEG_NAMES: ((names_of_iso_segs_development))
       - put: cf-deployment-development
         params: &deploy-params
           manifest: cf-deployment/cf-deployment.yml
@@ -612,7 +612,7 @@ jobs:
         image: general-task
         file: cf-manifests/ci/create-diego-cell-iso-seg.yml
         params:
-          ISO_SEG_NAMES: "" #((names_of_iso_segs_staging))    # Value in credhub
+          ISO_SEG_NAMES: ((names_of_iso_segs_staging))
       - put: cf-deployment-staging
         params:
           <<: *deploy-params
@@ -1172,7 +1172,7 @@ jobs:
         image: general-task
         file: cf-manifests/ci/create-diego-cell-iso-seg.yml
         params:
-          ISO_SEG_NAMES: "" #((names_of_iso_segs_production))    # Value in credhub
+          ISO_SEG_NAMES: ((names_of_iso_segs_production))
       - put: cf-deployment-production
         params: &prod-deploy-params
           <<: *deploy-params
@@ -1288,7 +1288,7 @@ jobs:
         image: general-task
         file: cf-manifests/ci/create-diego-cell-iso-seg.yml
         params:
-          ISO_SEG_NAMES: "" #((names_of_iso_segs_production))    # Value in credhub
+          ISO_SEG_NAMES: ((names_of_iso_segs_production))
       - put: cf-deployment-production
         params:
           <<: *prod-deploy-params

terraform/stacks/cf/iso.tf

@@ -9,3 +9,15 @@ resource "cloudfoundry_isolation_segment_entitlement" "platform" {
   ]
   default = false
 }
+
+resource "cloudfoundry_isolation_segment" "devtools" {
+  name = "diego-cell-iso-seg-devtools"
+}
+
+resource "cloudfoundry_isolation_segment_entitlement" "devtools" {
+  segment = cloudfoundry_isolation_segment.devtools.id
+  orgs = [
+    cloudfoundry_org.cloud-gov-devtools.id
+  ]
+  default = true
+}