浏览代码

jicofo: remove JICOFO_SHORT_ID (removed upstream)

bgrozev 2 年之前
父节点
当前提交
a2333b3e76
共有 2 个文件被更改,包括 0 次插入3 次删除
  1. 0 1
      docker-compose.yml
  2. 0 2
      jicofo/rootfs/defaults/jicofo.conf

+ 0 - 1
docker-compose.yml

@@ -269,7 +269,6 @@ services:
             - JICOFO_CONF_INITIAL_PARTICIPANT_WAIT_TIMEOUT
             - JICOFO_CONF_SINGLE_PARTICIPANT_TIMEOUT
             - JICOFO_ENABLE_HEALTH_CHECKS
-            - JICOFO_SHORT_ID
             - JIBRI_BREWERY_MUC
             - JIBRI_REQUEST_RETRIES
             - JIBRI_PENDING_TIMEOUT

+ 0 - 2
jicofo/rootfs/defaults/jicofo.conf

@@ -132,8 +132,6 @@ jicofo {
       // two MUST be in sync (otherwise bridges will crash because they won't know how to
       // deal with octo channels).
       enabled = {{ $ENABLE_OCTO }}
-
-      id = "{{ .Env.JICOFO_SHORT_ID | default "1" }}"
     }
 
     sctp {