Merge origin/DRIP_2.0 into DRIP_2.0

739f3029 · Spiros Koulouzis · 9ecb25f7 · 151d265b · 739f3029
Commit 739f3029 authored Dec 27, 2017 by Spiros Koulouzis
Show whitespace changes
Inline Side-by-side

Showing with 221 additions and 221 deletions

wt.yml docs/composer_files/WT/wt.yml +221 -221

No files found.
--- a/docs/composer_files/WT/wt.yml
+++ b/docs/composer_files/WT/wt.yml
@@ -69,202 +69,202 @@ services:
        published: 10001
        protocol: udp
        mode: host
-      - target: 10002
-        published: 10002
-        protocol: udp
-        mode: host
-      - target: 10003
-        published: 10003
-        protocol: udp
-        mode: host
-      - target: 10004
-        published: 10004
-        protocol: udp
-        mode: host
-      - target: 10005
-        published: 10005
-        protocol: udp
-        mode: host
-      - target: 10006
-        published: 10006
-        protocol: udp
-        mode: host
-      - target: 10007
-        published: 10007
-        protocol: udp
-        mode: host
-      - target: 10008
-        published: 10008
-        protocol: udp
-        mode: host
-      - target: 10009
-        published: 10009
-        protocol: udp
-        mode: host
-      - target: 10010
-        published: 10010
-        protocol: udp
-        mode: host
-      - target: 10011
-        published: 10011
-        protocol: udp
-        mode: host
-      - target: 10012
-        published: 10012
-        protocol: udp
-        mode: host
-      - target: 10013
-        published: 10013
-        protocol: udp
-        mode: host
-      - target: 10014
-        published: 10014
-        protocol: udp
-        mode: host
-      - target: 10015
-        published: 10015
-        protocol: udp
-        mode: host
-      - target: 10016
-        published: 10016
-        protocol: udp
-        mode: host
-      - target: 10017
-        published: 10017
-        protocol: udp
-        mode: host
-      - target: 10018
-        published: 10018
-        protocol: udp
-        mode: host
-      - target: 10019
-        published: 10019
-        protocol: udp
-        mode: host
-      - target: 10020
-        published: 10020
-        protocol: udp
-        mode: host
-      - target: 10021
-        published: 10021
-        protocol: udp
-        mode: host
-      - target: 10022
-        published: 10022
-        protocol: udp
-        mode: host
-      - target: 10023
-        published: 10023
-        protocol: udp
-        mode: host
-      - target: 10024
-        published: 10024
-        protocol: udp
-        mode: host
-      - target: 10025
-        published: 10025
-        protocol: udp
-        mode: host
-      - target: 10026
-        published: 10026
-        protocol: udp
-        mode: host
-      - target: 10027
-        published: 10027
-        protocol: udp
-        mode: host
-      - target: 10028
-        published: 10028
-        protocol: udp
-        mode: host
-      - target: 10029
-        published: 10029
-        protocol: udp
-        mode: host
-      - target: 10030
-        published: 10030
-        protocol: udp
-        mode: host
-      - target: 10031
-        published: 10031
-        protocol: udp
-        mode: host
-      - target: 10032
-        published: 10032
-        protocol: udp
-        mode: host
-      - target: 10033
-        published: 10033
-        protocol: udp
-        mode: host
-      - target: 10034
-        published: 10034
-        protocol: udp
-        mode: host
-      - target: 10035
-        published: 10035
-        protocol: udp
-        mode: host
-      - target: 10036
-        published: 10036
-        protocol: udp
-        mode: host
-      - target: 10037
-        published: 10037
-        protocol: udp
-        mode: host
-      - target: 10038
-        published: 10038
-        protocol: udp
-        mode: host
-      - target: 10039
-        published: 10039
-        protocol: udp
-        mode: host
-      - target: 10040
-        published: 10040
-        protocol: udp
-        mode: host
-      - target: 10041
-        published: 10041
-        protocol: udp
-        mode: host
-      - target: 10042
-        published: 10042
-        protocol: udp
-        mode: host
-      - target: 10043
-        published: 10043
-        protocol: udp
-        mode: host
-      - target: 10044
-        published: 10044
-        protocol: udp
-        mode: host
-      - target: 10045
-        published: 10045
-        protocol: udp
-        mode: host
-      - target: 10046
-        published: 10046
-        protocol: udp
-        mode: host
-      - target: 10047
-        published: 10047
-        protocol: udp
-        mode: host
-      - target: 10048
-        published: 10048
-        protocol: udp
-        mode: host
-      - target: 10049
-        published: 10049
-        protocol: udp
-        mode: host
-      - target: 10050
-        published: 10050
-        protocol: udp
-        mode: host
+      #- target: 10002
+        #published: 10002
+        #protocol: udp
+        #mode: host
+      #- target: 10003
+        #published: 10003
+        #protocol: udp
+        #mode: host
+      #- target: 10004
+        #published: 10004
+        #protocol: udp
+        #mode: host
+      #- target: 10005
+        #published: 10005
+        #protocol: udp
+        #mode: host
+      #- target: 10006
+        #published: 10006
+        #protocol: udp
+        #mode: host
+      #- target: 10007
+        #published: 10007
+        #protocol: udp
+        #mode: host
+      #- target: 10008
+        #published: 10008
+        #protocol: udp
+        #mode: host
+      #- target: 10009
+        #published: 10009
+        #protocol: udp
+        #mode: host
+      #- target: 10010
+        #published: 10010
+        #protocol: udp
+        #mode: host
+      #- target: 10011
+        #published: 10011
+        #protocol: udp
+        #mode: host
+      #- target: 10012
+        #published: 10012
+        #protocol: udp
+        #mode: host
+      #- target: 10013
+        #published: 10013
+        #protocol: udp
+        #mode: host
+      #- target: 10014
+        #published: 10014
+        #protocol: udp
+        #mode: host
+      #- target: 10015
+        #published: 10015
+        #protocol: udp
+        #mode: host
+      #- target: 10016
+        #published: 10016
+        #protocol: udp
+        #mode: host
+      #- target: 10017
+        #published: 10017
+        #protocol: udp
+        #mode: host
+      #- target: 10018
+        #published: 10018
+        #protocol: udp
+        #mode: host
+      #- target: 10019
+        #published: 10019
+        #protocol: udp
+        #mode: host
+      #- target: 10020
+        #published: 10020
+        #protocol: udp
+        #mode: host
+      #- target: 10021
+        #published: 10021
+        #protocol: udp
+        #mode: host
+      #- target: 10022
+        #published: 10022
+        #protocol: udp
+        #mode: host
+      #- target: 10023
+        #published: 10023
+        #protocol: udp
+        #mode: host
+      #- target: 10024
+        #published: 10024
+        #protocol: udp
+        #mode: host
+      #- target: 10025
+        #published: 10025
+        #protocol: udp
+        #mode: host
+      #- target: 10026
+        #published: 10026
+        #protocol: udp
+        #mode: host
+      #- target: 10027
+        #published: 10027
+        #protocol: udp
+        #mode: host
+      #- target: 10028
+        #published: 10028
+        #protocol: udp
+        #mode: host
+      #- target: 10029
+        #published: 10029
+        #protocol: udp
+        #mode: host
+      #- target: 10030
+        #published: 10030
+        #protocol: udp
+        #mode: host
+      #- target: 10031
+        #published: 10031
+        #protocol: udp
+        #mode: host
+      #- target: 10032
+        #published: 10032
+        #protocol: udp
+        #mode: host
+      #- target: 10033
+        #published: 10033
+        #protocol: udp
+        #mode: host
+      #- target: 10034
+        #published: 10034
+        #protocol: udp
+        #mode: host
+      #- target: 10035
+        #published: 10035
+        #protocol: udp
+        #mode: host
+      #- target: 10036
+        #published: 10036
+        #protocol: udp
+        #mode: host
+      #- target: 10037
+        #published: 10037
+        #protocol: udp
+        #mode: host
+      #- target: 10038
+        #published: 10038
+        #protocol: udp
+        #mode: host
+      #- target: 10039
+        #published: 10039
+        #protocol: udp
+        #mode: host
+      #- target: 10040
+        #published: 10040
+        #protocol: udp
+        #mode: host
+      #- target: 10041
+        #published: 10041
+        #protocol: udp
+        #mode: host
+      #- target: 10042
+        #published: 10042
+        #protocol: udp
+        #mode: host
+      #- target: 10043
+        #published: 10043
+        #protocol: udp
+        #mode: host
+      #- target: 10044
+        #published: 10044
+        #protocol: udp
+        #mode: host
+      #- target: 10045
+        #published: 10045
+        #protocol: udp
+        #mode: host
+      #- target: 10046
+        #published: 10046
+        #protocol: udp
+        #mode: host
+      #- target: 10047
+        #published: 10047
+        #protocol: udp
+        #mode: host
+      #- target: 10048
+        #published: 10048
+        #protocol: udp
+        #mode: host
+      #- target: 10049
+        #published: 10049
+        #protocol: udp
+        #mode: host
+      #- target: 10050
+        #published: 10050
+        #protocol: udp
+        #mode: host
    networks:
      uc-ol:
        aliases:
@@ -329,31 +329,31 @@ services:
        aliases:
          - db
          
-  monitor-server:
-    image: salmant/ul_monitoring_server_container_image
-    deploy:
-      replicas: 1
-      update_config:
-        parallelism: 1
-        delay: 10s
-      restart_policy:
-        condition: any
-      placement:
-        constraints: [node.role == manager]
-    environment:
-      - MONITORING_SERVER=monitor-server
-    ports:
-      - "8080:8080"
-      - "4242:4242"
-      - "4245:4245"
-      - "7199:7199"
-      - "7000:7000"
-      - "7001:7001"
-      - "9160:9160"
-      - "9042:9042"
-      - "8012:8012"
-      - "61621:61621"
-    hostname: monitor-server          
+  #monitor-server:
+    #image: salmant/ul_monitoring_server_container_image
+    #deploy:
+      #replicas: 1
+      #update_config:
+        #parallelism: 1
+        #delay: 10s
+      #restart_policy:
+        #condition: any
+      #placement:
+        #constraints: [node.role == manager]
+    #environment:
+      #- MONITORING_SERVER=monitor-server
+    #ports:
+      #- "8080:8080"
+      #- "4242:4242"
+      #- "4245:4245"
+      #- "7199:7199"
+      #- "7000:7000"
+      #- "7001:7001"
+      #- "9160:9160"
+      #- "9042:9042"
+      #- "8012:8012"
+      #- "61621:61621"
+    #hostname: monitor-server          

  monitor-adapter:
    image: beia/monitoring_agent