consolidate manifest templates

cloudfoundry-attic · Mar 19, 2016 · d5ef0bd · d5ef0bd
1 parent fc35195
commit d5ef0bd
Show file tree

Hide file tree

Showing 10 changed files with 749 additions and 780 deletions.
diff --git a/scripts/generate_deployment_manifest b/scripts/generate_deployment_manifest
@@ -31,9 +31,7 @@ if [ "$infrastructure" != "aws" ] && \
 fi
 
 spiff merge \
-  "${templates}/cf-deployment.yml" \
-  "${templates}/cf-resource-pools.yml" \
-  "${templates}/cf-jobs.yml" \
-  "${templates}/cf-properties.yml" \
+  "${templates}/generic-manifest-mask.yml" \
+  "${templates}/cf.yml" \
   "${templates}/cf-infrastructure-${infrastructure}.yml" \
   "$@"
diff --git a/spec/fixtures/aws/cf-manifest.yml b/spec/fixtures/aws/cf-manifest.yml
@@ -852,11 +852,6 @@ jobs:
   templates:
   - name: smoke-tests
     release: cf
-meta:
-  environment: ENVIRONMENT
-  releases:
-  - name: cf
-    version: latest
 name: ENVIRONMENT
 networks:
 - name: cf1

diff --git a/spec/fixtures/openstack/cf-manifest.yml b/spec/fixtures/openstack/cf-manifest.yml
@@ -855,11 +855,6 @@ jobs:
   templates:
   - name: smoke-tests
     release: cf
-meta:
-  environment: ENVIRONMENT
-  releases:
-  - name: cf
-    version: latest
 name: ENVIRONMENT
 networks:
 - cloud_properties:

diff --git a/spec/fixtures/vsphere/cf-manifest.yml b/spec/fixtures/vsphere/cf-manifest.yml
@@ -862,11 +862,6 @@ jobs:
   templates:
   - name: smoke-tests
     release: cf
-meta:
-  environment: ENVIRONMENT
-  releases:
-  - name: cf
-    version: latest
 name: ENVIRONMENT
 networks:
 - name: cf1

diff --git a/spec/fixtures/warden/cf-manifest.yml b/spec/fixtures/warden/cf-manifest.yml
@@ -896,11 +896,6 @@ jobs:
   templates:
   - name: smoke-tests
     release: cf
-meta:
-  environment: cf-warden
-  releases:
-  - name: cf
-    version: latest
 name: cf-warden
 networks:
 - name: cf1

diff --git a/templates/cf-deployment.yml b/templates/cf-deployment.yml