From e7dd5b4df584434786e4560bc0b6dad6a6c95c62 Mon Sep 17 00:00:00 2001
From: Dennis Bell <dennis.j.bell@gmail.com>
Date: Thu, 30 Jul 2020 09:25:53 -0700
Subject: [PATCH] replace custom small-footprint with upstream

---
 hooks/blueprint                |  7 ++++--
 operations/small-footprint.yml | 42 ----------------------------------
 2 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 operations/small-footprint.yml

diff --git a/hooks/blueprint b/hooks/blueprint
index ce7f6e2d..dcd7fa55 100755
--- a/hooks/blueprint
+++ b/hooks/blueprint
@@ -190,10 +190,13 @@ for want in $GENESIS_REQUESTED_FEATURES; do
     compiled-releases)
       want_feature "cf-deployment/operations/use-compiled-releases" || features+=( "compiled-releases" )
       ;;
+    small-footprint)
+      want_feature "cf-deployment/operations/scale-to-one-az" || features+=( "small-footprint" )
+      ;;
     local-postgres-db|local-mysql-db|mysql-db|postgres-db) db_specified=1; features+=( "$want" ) ;;
     bare|partitioned-network|haproxy|tls|self-signed) features+=( "$want" ) ;;
     aws-blobstore|azure-blobstore|gcp-blobstore|gcp-use-access-key) features+=( "$want" ) ;;
-    nfs-volume-services|small-footprint|enable-service-discovery) features+=( "$want" ) ;;
+    nfs-volume-services|enable-service-discovery) features+=( "$want" ) ;;
     app-autoscaler-integration|prometheus-integration) features+=( "$want" ) ;;
     +migrated_v1_env|+override-db-names) features+=( "$want" ) ;;
     cf-deployment/*)
@@ -331,7 +334,7 @@ for want in $GENESIS_REQUESTED_FEATURES; do
     compiled-releases)
       manifest+=( "cf-deployment/operations/use-compiled-releases.yml" ) ;;
     small-footprint)
-      manifest+=( "operations/small-footprint.yml" ) ;;
+      manifest+=( "cf-deployment/operations/scale-to-one-az.yml" ) ;;
     nfs-volume-services)
       manifest+=( "cf-deployment/operations/enable-nfs-volume-service.yml" );;
     enable-service-discovery)
diff --git a/operations/small-footprint.yml b/operations/small-footprint.yml
deleted file mode 100644
index f43e884c..00000000
--- a/operations/small-footprint.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-# Use this override to only deploy single instance of each job
-- type: replace
-  path: /instance_groups/name=nats/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=diego-api/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=uaa/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=scheduler/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=diego-cell/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=router/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=api/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=cc-worker/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=adapter/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=doppler/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=log-api/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=tcp-router/instances
-  value: 1
-- type: replace
-  path: /instance_groups/name=credhub/instances
-  value: 1
-