Started changing templates to unify them with production version of vhr15

vs_starter/templates/docker-compose.yml

@@ -43,7 +43,7 @@ services:
       - ./config/{{slug}}/{{slug}}_obs.env
     secrets:
       - DJANGO_PASSWORD
-      - OS_PASSWORD
+      - OS_PASSWORD_{{slug | upper}}
       - DJANGO_SECRET_KEY
     environment:
       INSTANCE_ID: "prism-view-server_renderer"
@@ -53,7 +53,7 @@ services:
       WAIT_SERVICES: "database:5432"
       WAIT_TIMEOUT: 180
       DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
-      OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
+      OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD_{{slug | upper}}"
       DJANGO_SECRET_KEY_FILE: "/run/secrets/DJANGO_SECRET_KEY"
     configs:
       - source: init-db
@@ -72,7 +72,7 @@ services:
     env_file:
       - ./config/{{slug}}/{{slug}}.env
       - ./config/{{slug}}/{{slug}}_db.env
-      - ./config/{{slug}}/{{slug}}_obs.env
+      - ./config/{{slug}}/{{slug}}_obs_cache.env
     secrets:
       - OS_PASSWORD
     environment:
@@ -98,6 +98,9 @@ services:
       - type: volume
         source: from-fepd
         target: /mnt/data
+      - type: volume
+        source: ingestor-data
+        target: /var/ingestor
     environment:
       INSTANCE_ID: "prism-view-server_ingestor"
       INGESTOR_SUCCESS_DIR: "/var/ingestor/success"
@@ -112,18 +115,16 @@ services:
       - ./config/{{slug}}/{{slug}}.env
       - ./config/{{slug}}/{{slug}}_obs.env
     secrets:
-      - OS_PASSWORD
+      - OS_PASSWORD_{{slug | upper}}
       - OS_PASSWORD_DOWNLOAD
     environment:
       INSTANCE_ID: "prism-view-server_preprocessor"
       WAIT_SERVICES: "redis:6379"
-      OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
+      OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD_{{slug | upper}}"
       OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
     configs:
       - source: preprocessor-config
         target: /config.yaml
-    deploy:
-      replicas: 1
     networks:
       - intnet
     command:
@@ -145,7 +146,7 @@ services:
       - ./config/{{slug}}/{{slug}}_obs.env
     secrets:
       - DJANGO_PASSWORD
-      - OS_PASSWORD
+      - OS_PASSWORD_{{slug | upper}}
       - DJANGO_SECRET_KEY
     environment:
       INSTANCE_ID: "prism-view-server_registrar"
@@ -154,7 +155,7 @@ services:
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "redis:6379 database:5432"
       WAIT_TIMEOUT: 180
-      OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD"
+      OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD_{{slug | upper}}"
       DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
       DJANGO_SECRET_KEY_FILE: "/run/secrets/DJANGO_SECRET_KEY"
       REPORTING_DIR: "/mnt/reports/"
@@ -211,9 +212,12 @@ volumes:
   instance-data:
   from-fepd:
   report-data:
+  ingestor-data:
 networks:
   intnet:
 secrets:
+  OS_PASSWORD_{{slug | upper}}:
+    external: true
   OS_PASSWORD:
     external: true
   OS_PASSWORD_DOWNLOAD: