env fix, remove service user, latest conf updates

Author: tcarmet

templates/backbeat/Dockerfile.setup

@@ -36,14 +36,6 @@
             "host": "127.0.0.1",
             "port": 9990
         },
-        "mongo": {
-            "replicaSetHosts":
-                "localhost:27017,localhost:27018,localhost:27019",
-            "writeConcern": "majority",
-            "replicaSet": "rs0",
-            "readPreference": "primary",
-            "database": "metadata"
-        },
         "kafka": {
             "topic": "backbeat-oplog",
             "consumerGroupId": "backbeat-qp-oplog-group"

templates/backbeat/config.json

@@ -1 +1,3 @@
-EXPIRE_ONE_DAY_EARLIER=true
+export EXPIRE_ONE_DAY_EARLIER=true
+export CRASH_ON_BATCH_TIMEOUT=true
+export REMOTE_MANAGEMENT_DISABLE=true

templates/backbeat/create-service-user.sh

@@ -54,7 +54,6 @@ autostart = true
 {{ if .Features.CrossRegionReplication.Enabled }}
 [program:crr-queue-populator]
 command = bash -c "source /conf/env && exec npm run queue_populator"
-environment = CRASH_ON_BATCH_TIMEOUT=true REMOTE_MANAGEMENT_DISABLE=true
 numprocs = 1
 process_name = %(program_name)s_%(process_num)s
 stdout_logfile = %(ENV_LOG_DIR)s/%(program_name)s-%(process_num)s.log
@@ -68,7 +67,7 @@ autostart = true
 
 [program:crr-queue-processor]
 command = bash -c "source /conf/env && exec npm run queue_processor"
-environment = CRASH_ON_BATCH_TIMEOUT=true REMOTE_MANAGEMENT_DISABLE=true BOOTSTRAP_SITE_NAME=sf
+environment = BOOTSTRAP_SITE_NAME=sf
 numprocs = 1
 process_name = %(program_name)s_%(process_num)s
 stdout_logfile = %(ENV_LOG_DIR)s/%(program_name)s-%(process_num)s.log
@@ -82,7 +81,6 @@ autostart = true
 
 [program:crr-status-processor]
 command = bash -c "source /conf/env && exec npm run replication_status_processor"
-environment = CRASH_ON_BATCH_TIMEOUT=true REMOTE_MANAGEMENT_DISABLE=true
 numprocs = 1
 process_name = %(program_name)s_%(process_num)s
 stdout_logfile = %(ENV_LOG_DIR)s/%(program_name)s-%(process_num)s.log

templates/backbeat/env

@@ -150,36 +150,16 @@ services:
     environment:
       SUPERVISORD_CONF: supervisord.conf
       BACKBEAT_CONFIG_FILE: /conf/config.json
-    depends_on:
-      setup-backbeat:
-        condition: service_completed_successfully
     volumes:
       - ./config/backbeat/supervisord.conf:/conf/supervisord.conf:ro
       - ./config/backbeat/config.json:/conf/config.json:ro
       - ./config/backbeat/config.notification.json:/conf/config.notification.json:ro
       - ./config/backbeat/env:/conf/env:ro
       - ./logs/backbeat:/logs
-      - ./config/vault/:/secrets/:rw
     profiles:
       - feature-crr
       - feature-notifications
 
-  setup-backbeat:
-    build:
-      context: ./config/backbeat
-      dockerfile: Dockerfile.setup
-      args:
-        BASE_IMAGE: ${BACKBEAT_IMAGE}
-    container_name: workbench-setup-backbeat
-    network_mode: host
-    depends_on:
-      setup-vault:
-        condition: service_completed_successfully
-    volumes:
-      - ./config/vault/:/secrets
-    profiles:
-      - feature-crr
-
   redis:
     image: ${REDIS_IMAGE}
     container_name: workbench-redis