Merge remote-tracking branch 'origin/master' into SAN-4010-update-swarm-v1.2.0

Author: Myztiq

ansible/app-services.yml

@@ -1,4 +1,5 @@
 - include: detention.yml git_branch="{{ detention_branch }}"
+- include: drake.yml git_branch="{{ drake_branch }}"
 - include: eru.yml git_branch="{{ eru_branch }}"
 - include: mavis.yml git_branch="{{ mavis_branch }}"
 - include: metis.yml git_branch="{{ astral_branch }}"

ansible/base.yml

@@ -8,5 +8,5 @@
   - { role: docker, tags: [docker] }
   - { role: datadog, tags: [datadog] }
   - { role: ulimits, tags: [ulimits] }
-  - { role: loggly-tls, tags: [loggly] }
+  - { role: loggly, tags: [loggly] }
   - { role: node }

ansible/charon.yml

@@ -9,5 +9,5 @@
   - { role: notify, tags: [notify] }
   - { role: git_repo }
   - { role: node_service }
-  - { role: loggly-rotate }
+  - { role: loggly }
   - { role: consul_value, tags: [consul_value] }

ansible/dock.yml

@@ -9,8 +9,7 @@
       name={{ dock }}
       groups=dock
 
+- include: charon.yml git_branch="{{ charon_version }}"
 - include: dock-init.yml git_branch="{{ dock_init_version }}"
-- include: krain.yml git_branch="{{ krain_version }}"
 - include: filibuster.yml git_branch="{{ filibuster_version }}"
-- include: charon.yml git_branch="{{ charon_version }}"
 - include: image-builder.yml git_branch="{{ image_builder_version }}"

ansible/filibuster.yml

@@ -8,5 +8,5 @@
   - { role: notify, tags: [notify] }
   - { role: git_repo }
   - { role: node_service }
-  - { role: loggly-rotate }
+  - { role: loggly }
   - { role: consul_value, tags: [consul_value] }

ansible/group_vars/all.yml

@@ -73,6 +73,11 @@ detention_host_address: "{{ hostvars[groups['detention'][0]]['ansible_default_ip
 detention_port: 9123
 detention_hostname: detention.{{ domain }}
 
+# docker log driver
+
+log_driver: syslog
+log_facility: local7
+
 # docker
 docker_ca_path: /etc/ssl/docker/ca.pem
 docker_cert_path: /etc/ssl/docker/cert.pem

ansible/group_vars/alpha-consul.yml

@@ -9,8 +9,6 @@ pause_length_minutes: 3
 container_image: runnable/consul
 container_tag: v0.6.3
 
-log_driver: json-file
-
 container_run_opts: >
   -d
   -h {{ inventory_hostname }}

ansible/group_vars/alpha-hipache.yml

@@ -5,8 +5,6 @@ container_image: registry.runnable.com/runnable/hipache
 container_tag: latest
 hosted_ports: [ 80, 443 ]
 
-log_driver: json-file
-
 container_run_opts: >
   -d
   -p 80:80

ansible/group_vars/alpha-mongo-navi.yml

@@ -3,9 +3,6 @@ name: mongo-navi
 
 db_path: /opt/mongodb/db
 
-# enable logs for mongo
-log_driver: json-file
-
 # container_kill_start settings
 container_image: mongo
 container_tag: latest

ansible/group_vars/alpha-redis-tls.yml

@@ -1,7 +1,6 @@
 name: redis
 
 # container_kill_start settings
-log_driver: json-file
 container_image: runnable/redis-stunnel
 container_tag: v0.1.0
 container_run_opts: >