Merge pull request #590 from Capgemini/573-traefik

#573 - traefik - replacement for haproxy and registrator

.gitignore

@@ -18,3 +18,5 @@ tests/spec/*/*runtime_spec.rb
 contrib-plugins/*
 vault-security.yaml
 terraform/*/.terraform
+roles/coreos_bootstrap
+roles/coreos_timezone

group_vars/all

@@ -1,6 +1,4 @@
 mesos_cluster_name: "Cluster01"
-haproxy_username: "admin"
-haproxy_password: "admin"
 zookeeper_client_port: "2181"
 zookeeper_server_group: zookeeper_servers
 zookeeper_peers_nodes: "

group_vars/mesos_slaves

@@ -19,10 +19,3 @@ datadog_checks:
       default_timeout: 10
     instances:
       - url: "http://{{ ansible_default_ipv4.address }}:5051"
-  haproxy:
-    init_config:
-      default_timeout: 10
-    instances:
-      - url: "http://{{ ansible_default_ipv4.address }}:9000/haproxy_stats"
-        username: "{{ haproxy_username }}"
-        password: "{{ haproxy_password }}"

roles/consul/handlers/main.yml

@@ -1,19 +1,12 @@
 ---
 # handlers file for consul
-# @todo - handle restarts properly (choose one approach here)
-- name: restart consul
-  service:
-    name: consul
-    state: restarted
-  sudo: yes
-  notify:
-    - wait for consul to listen
-
 - name: wait for consul to listen
   wait_for:
     host: "{{ consul_bind_addr }}"
     port: 8500
 
-- name: restart consul systemd
+- name: restart consul
   sudo: yes
   command: systemctl restart consul
+  notify:
+    - wait for consul to listen

roles/consul/meta/main.yml

@@ -120,7 +120,8 @@ galaxy_info:
   #- packaging
   - system
   #- web
-dependencies: []
+dependencies:
+  - role: handlers
   # List your role dependencies here, one per line. Only
   # dependencies available via galaxy should be listed here.
   # Be sure to remove the '[]' above if you add dependencies

roles/consul/tasks/config.yml

@@ -20,3 +20,22 @@
     - restart consul
   tags:
     - consul
+
+- name: deploy consul service
+  sudo: yes
+  sudo_user: root
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  with_items:
+    - src: consul.service.j2
+      dest: /etc/systemd/system/consul.service
+    - src: dnsmasq.service.j2
+      dest: /etc/systemd/system/dnsmasq.service
+    - src: consul-discovery.service.j2
+      dest: /etc/systemd/system/consul-discovery.service
+  notify:
+    - reload systemd
+    - restart consul
+  tags:
+    - consul

roles/consul/tasks/main.yml

@@ -1,33 +1,24 @@
 ---
 - include: config.yml
 
-- name: deploy consul service
-  sudo: yes
-  sudo_user: root
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-  with_items:
-    - src: consul.service.j2
-      dest: /etc/systemd/system/consul.service
-    - src: consul-discovery.service.j2
-      dest: /etc/systemd/system/consul-discovery.service
-  notify:
-    - restart consul systemd
-  tags:
-    - consul
-
 - name: enable consul
   sudo: yes
   service:
     name: consul
     enabled: yes
     state: started
   notify:
-    - restart consul systemd
+    - restart consul
   tags:
     - consul
 
+- name: enable dnsmasq
+  sudo: yes
+  service:
+    name: dnsmasq
+    enabled: yes
+    state: started
+
 #- name: enable consul-discovery
 #  sudo: yes
 #  service:

roles/consul/templates/consul.json.j2

@@ -11,6 +11,15 @@
 {% if inventory_hostname in groups[consul_servers_group] %}
   "server": true,
   "bootstrap_expect": {{ consul_bootstrap_expect }},
+  "dns_config": {
+    "allow_stale": false
+  },
+{% else %}
+  "leave_on_terminate": true,
+  "dns_config": {
+    "allow_stale": true,
+    "max_stale": "1s"
+  },
 {% endif %}
 {% if consul_atlas_join|bool %}
   "atlas_join": true,

roles/consul/templates/consul.service.j2

@@ -27,13 +27,10 @@ ExecStart=/usr/bin/bash -c "/usr/bin/docker run --rm --name consul \
 -p 8302:8302/udp \
 -p 8400:8400 \
 -p 8500:8500 \
--p 53:8600/udp \
+-p 8600:8600/udp \
 {{ consul_image }}"
 
-ExecStartPost=/usr/bin/bash -c 'sleep 1; echo -e "[Resolve]\nDNS=$(docker inspect --format \'{% raw %}{{ .NetworkSettings.IPAddress }}{% endraw %}\' consul)" > /etc/systemd/resolved.conf.d/00-consul-dns.conf && systemctl restart systemd-resolved'
-
 ExecStop=/usr/bin/docker stop consul
-ExecStopPost=/usr/bin/bash -c 'rm /etc/systemd/resolved.conf.d/00-consul-dns.conf && systemctl restart systemd-resolved'
 
 [Install]
 WantedBy=multi-user.target

roles/consul/templates/dnsmasq.service.j2

@@ -0,0 +1,31 @@
+[Unit]
+Description=Dnsmasq
+PartOf=consul.service
+Requires=docker.service
+After=consul.service
+After=docker.service
+
+[Service]
+EnvironmentFile=/etc/environment
+Restart=on-failure
+ExecStartPre=/usr/bin/mkdir -p /etc/systemd/resolved.conf.d
+ExecStartPre=-/bin/sh -c 'rm /etc/systemd/resolved.conf.d/00-consul-dns.conf && systemctl restart systemd-resolved'
+ExecStartPre=-/usr/bin/docker kill dnsmasq
+ExecStartPre=-/usr/bin/docker rm dnsmasq
+ExecStartPre=/usr/bin/docker pull andyshinn/dnsmasq
+ExecStart=/bin/sh -c '/usr/bin/docker run --rm \
+  --name dnsmasq \
+  --net=host \
+  --cap-add=NET_ADMIN \
+  --env SERVICE_IGNORE=true \
+  andyshinn/dnsmasq -S /consul/${COREOS_PRIVATE_IPV4}#8600'
+
+ExecStartPost=/bin/sh -c '\
+  echo -e "[Resolve]\nDNS=${COREOS_PRIVATE_IPV4}" > /etc/systemd/resolved.conf.d/00-consul-dns.conf && \
+  systemctl restart systemd-resolved;'
+
+ExecStop=/usr/bin/docker stop dnsmasq
+ExecStopPost=/bin/sh -c 'rm /etc/systemd/resolved.conf.d/00-consul-dns.conf && systemctl restart systemd-resolved'
+
+[Install]
+WantedBy=multi-user.target

roles/handlers/handlers/main.yml

@@ -1,3 +1,7 @@
+- name: reload systemd
+  sudo: yes
+  command: systemctl daemon-reload
+
 - name: restart consul
   service:
     name: consul

roles/marathon/defaults/main.yml

@@ -16,4 +16,4 @@ marathon_rebuild_container: False
 marathon_image: "mesosphere/marathon:v{{ marathon_version }}"
 marathon_master_peers: "zk://{{ zookeeper_peers_nodes }}/mesos"
 marathon_zk_peers: "zk://{{ zookeeper_peers_nodes }}/marathon"
-marathon_command: "--artifact_store {{ marathon_artifact_store }} --hostname {{ marathon_hostname }} --master {{ marathon_master_peers }} --zk {{ marathon_zk_peers }}"
+marathon_command: "--event_subscriber http_callback --artifact_store {{ marathon_artifact_store }} --hostname {{ marathon_hostname }} --master {{ marathon_master_peers }} --zk {{ marathon_zk_peers }}"

roles/marathon/tasks/main.yml

@@ -31,10 +31,12 @@
   tags:
     - marathon
 
-#- name: Set marathon consul service definition
-#  sudo: yes
-#  template:
-#    src: marathon-consul.j2
-#    dest: "{{ marathon_consul_dir }}/marathon.json"
-#  notify:
-#    - restart consul
+- name: Set marathon consul service definition
+  sudo: yes
+  template:
+    src: marathon-consul.j2
+    dest: "{{ marathon_consul_dir }}/marathon.json"
+  notify:
+    - restart consul
+  tags:
+    - marathon

roles/mesos/tasks/master.yml

@@ -14,7 +14,7 @@
   sudo_user: root
   template:
     src: mesos-master.service.j2
-    dest: "/etc/systemd/system/mesos-master.service"
+    dest: /etc/systemd/system/mesos-master.service
   notify:
     - restart mesos master
   tags:

roles/mesos/tasks/slave.yml

@@ -14,7 +14,7 @@
   sudo_user: root
   template:
     src: mesos-slave.service.j2
-    dest: "/etc/systemd/system/mesos-slave.service"
+    dest: /etc/systemd/system/mesos-slave.service
   notify:
     - restart mesos slave
   tags: