# HG changeset patch
# User smith@nwoca.org
# Date 1494088694 -3600
# Node ID 292f393122d4709550ec500fec6d0a858aaeec47
# Parent  6943c7dd91f6f4a72674f8f4555838c0a598d7a2
DEP-12 consolidate template to correctly handle volumes

diff -r 6943c7dd91f6 -r 292f393122d4 compose2/preview/usas-template.yml
--- a/compose2/preview/usas-template.yml	Sat May 06 17:12:22 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-version: "2.1"
-services:
-  usasdb:
-    extends:
-      file: /ssdt/compose2/preview/usxs-services.yml
-      service: usasdb-base
-  usasapp:
-    extends:
-      file: /ssdt/compose2/preview/usas-services.yml
-      service: usasapp-base
-    depends_on:
-      - usasdb
-volumes:
-  usasdata:
diff -r 6943c7dd91f6 -r 292f393122d4 compose2/preview/usps-template.yml
--- a/compose2/preview/usps-template.yml	Sat May 06 17:12:22 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-version: "2.1"
-services:
-  uspsdb:
-    extends:
-      file: /ssdt/compose2/preview/usxs-services.yml
-      service: uspsdb-base
-  uspsapp:
-    extends:
-       file: /ssdt/compose2/preview/usxs-services.yml
-       service: uspsapp-base
-    depends_on:
-      - uspsdb
-volumes:
-  uspsdata:
-  
diff -r 6943c7dd91f6 -r 292f393122d4 compose2/preview/usxs-template.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose2/preview/usxs-template.yml	Sat May 06 17:38:14 2017 +0100
@@ -0,0 +1,25 @@
+version: "2.1"
+services:
+  usasdb:
+    extends:
+      file: /ssdt/compose3/preview/usxs-services.yml
+      service: usasdb-base
+  usasapp:
+    extends:
+       file: /ssdt/compose3/preview/usxs-services.yml
+       service: usasapp-base
+    depends_on:
+      - usasdb
+  uspsdb:
+    extends:
+      file: /ssdt/compose2/preview/usxs-services.yml
+      service: uspsdb-base
+  uspsapp:
+    extends:
+       file: /ssdt/compose2/preview/usxs-services.yml
+       service: uspsapp-base
+    depends_on:
+      - uspsdb
+volumes:
+  usasdata:
+  uspsdata:
\ No newline at end of file