jicofo: add bridge region support and local region (#1497)

docker-compose.yml

@@ -274,11 +274,13 @@ services:
             - ENABLE_SCTP
             - ENABLE_AUTO_LOGIN
             - JICOFO_AUTH_PASSWORD
+            - JICOFO_BRIDGE_REGION_GROUPS
             - JICOFO_ENABLE_BRIDGE_HEALTH_CHECKS
             - JICOFO_CONF_INITIAL_PARTICIPANT_WAIT_TIMEOUT
             - JICOFO_CONF_SINGLE_PARTICIPANT_TIMEOUT
             - JICOFO_ENABLE_HEALTH_CHECKS
             - JICOFO_ENABLE_REST
+            - JICOFO_OCTO_REGION
             - JIBRI_BREWERY_MUC
             - JIBRI_REQUEST_RETRIES
             - JIBRI_PENDING_TIMEOUT

jicofo/rootfs/defaults/jicofo.conf

@@ -75,6 +75,10 @@ jicofo {
       {{ else }}
       brewery-jid = "{{ $JVB_BREWERY_MUC }}@{{ $XMPP_INTERNAL_MUC_DOMAIN }}"
       {{ end }}
+
+      {{ if .Env.JICOFO_BRIDGE_REGION_GROUPS }}
+      region-groups = [{{ .Env.JICOFO_BRIDGE_REGION_GROUPS }}]
+      {{ end }}
     }
     // Configure the codecs and RTP extensions to be used in the offer sent to clients.
     codec {
@@ -135,6 +139,10 @@ jicofo {
     }
     {{ end }}
 
+    {{ if .Env.JICOFO_OCTO_REGION }}
+    local-region = "{{ .Env.JICOFO_OCTO_REGION }}"
+    {{ end }}
+
     octo {
       // Whether or not to use Octo. Note that when enabled, its use will be determined by
       // $jicofo.bridge.selection-strategy. There's a corresponding flag in the JVB and these