Splitting out dnsmasq

ansible/roles/consul/handlers/main.yml

@@ -10,12 +10,6 @@
 - name: reload consul configuration
   import_tasks: reload_consul_conf.yml
 
-- name: restart dnsmasq
-  become: yes
-  service:
-    name: dnsmasq
-    state: restarted
-
 - name: reload consul service
   become: yes
   service:

ansible/roles/consul/tasks/main.yml

@@ -18,54 +18,3 @@
   apt: 
     name: consul
 
-###########
-# Dnsmasq #
-########### 
-
-- name: Install Dnsmasq package
-  become: yes
-  apt:
-    name: dnsmasq
-    state: present
-
-- name: Enable dnsmasq service
-  become: yes
-  service:
-    name: dnsmasq
-    enabled: true
-
-- name: Bind dnsmasq to localhost
-  become: yes
-  lineinfile: dest=/etc/dnsmasq.conf state=present line='listen-address=127.0.0.1'
-
-- name: Add localhost to resolv.conf
-  become: yes
-  lineinfile: dest=/etc/resolv.conf state=present line='nameserver 127.0.0.1' insertbefore=BOF
-
-- name: user=root dnsmasq
-  become: yes
-  lineinfile: dest=/etc/dnsmasq.conf state=present line='user=root'
-
-- name: Stop systemd-resolved
-  become: yes
-  systemd:
-    name: systemd-resolved
-    state: stopped
-    enabled: no
-    masked: yes
-
-- name: Launch dnsmasq
-  become: yes
-  service:
-    name: dnsmasq
-    state: started
-
-- name: Create Dnsmasq configuration
-  become: yes
-  template:
-    src: dnsmasq-10-consul.j2
-    dest: /etc/dnsmasq.d/10-consul
-    owner: root
-    group: root
-    mode: 0644
-  notify: restart dnsmasq

ansible/roles/dnsmasq/handlers/main.yml

@@ -0,0 +1,6 @@
+---
+- name: restart dnsmasq
+  become: yes
+  service:
+    name: dnsmasq
+    state: restarted

ansible/roles/dnsmasq/tasks/main.yml

@@ -0,0 +1,48 @@
+---
+- name: Install Dnsmasq package
+  become: yes
+  apt:
+    name: dnsmasq
+    state: present
+
+- name: Enable dnsmasq service
+  become: yes
+  service:
+    name: dnsmasq
+    enabled: true
+
+- name: Bind dnsmasq to localhost
+  become: yes
+  lineinfile: dest=/etc/dnsmasq.conf state=present line='listen-address=127.0.0.1'
+
+- name: Add localhost to resolv.conf
+  become: yes
+  lineinfile: dest=/etc/resolv.conf state=present line='nameserver 127.0.0.1' insertbefore=BOF
+
+- name: user=root dnsmasq
+  become: yes
+  lineinfile: dest=/etc/dnsmasq.conf state=present line='user=root'
+
+- name: Stop systemd-resolved
+  become: yes
+  systemd:
+    name: systemd-resolved
+    state: stopped
+    enabled: no
+    masked: yes
+
+- name: Create Dnsmasq configuration
+  become: yes
+  template:
+    src: dnsmasq-10-consul.j2
+    dest: /etc/dnsmasq.d/10-consul
+    owner: root
+    group: root
+    mode: 0644
+  notify: restart dnsmasq
+
+- name: Launch dnsmasq
+  become: yes
+  service:
+    name: dnsmasq
+    state: started

ansible/setup_app.yml

@@ -9,9 +9,10 @@
     
   roles:
     - {role: 'base', tags: 'base'}
+    - {role: 'repo', tags: 'repo'}
+    - {role: 'dnsmasq', tags: 'consul'}
     - {role: 'consul', tags: 'consul'}
     - {role: 'consul-client', tags: 'consul'}
     - {role: 'docker', tags: 'docker'}
-    - {role: 'repo', tags: 'repo'}
     - {role: 'web', tags: 'web'}
     - {role: 'nginx', tags: 'nginx'}

ansible/setup_elasticsearch.yml

@@ -11,6 +11,7 @@
     - base
     - docker
     - repo
+    - {role: 'dnsmasq', tags: 'consul'}
     - {role: 'consul', tags: 'consul'}
     - {role: 'consul-client', tags: 'consul'}
     - {role: 'elasticsearch', tags: 'elasticsearch'}

ansible/setup_mongo.yml

@@ -12,6 +12,7 @@
     - base
     - docker
     - repo
+    - {role: 'dnsmasq', tags: 'consul'}
     - {role: 'consul', tags: 'consul'}
     - {role: 'consul-client', tags: 'consul'}
     - {role: 'mongo', tags: 'mongo'}

ansible/setup_node.yml

@@ -13,6 +13,7 @@
     - base
     - docker
     - repo
+    - {role: 'dnsmasq', tags: 'consul'}
     - {role: 'consul', tags: 'consul'}
     - {role: 'consul-client', tags: 'consul'}
     - {role: 'node', tags: 'node'}

ansible/setup_postgres.yml

@@ -13,6 +13,7 @@
     - base
     - docker
     - repo
+    - {role: 'dnsmasq', tags: 'consul'}
     - {role: 'consul', tags: 'consul'}
     - {role: 'consul-client', tags: 'consul'}
     - {role: 'postgres', tags: 'postgres'}

ansible/setup_redis.yml

@@ -11,6 +11,7 @@
     - base
     - docker
     - repo
+    - {role: 'dnsmasq', tags: 'consul'}
     - {role: 'consul', tags: 'consul'}
     - {role: 'consul-client', tags: 'consul'}
     - {role: 'redis', tags: 'redis'}

ansible/setup_task.yml

@@ -11,6 +11,7 @@
     - base
     - docker
     - repo
+    - {role: 'dnsmasq', tags: 'consul'}
     - {role: 'consul', tags: 'consul'}
     - {role: 'consul-client', tags: 'consul'}
     - {role: 'celery_task', tags: 'celery_task'}

ansible/setup_www.yml

@@ -11,6 +11,7 @@
     - base
     - docker
     - {role: 'repo', tags: 'repo'}
+    - {role: 'dnsmasq', tags: 'consul'}
     - {role: 'consul', tags: 'consul'}
     - {role: 'consul-client', tags: 'consul'}
     - {role: 'monitor', tags: 'monitor'}

terraform/digitalocean.tf

@@ -32,7 +32,7 @@ resource "digitalocean_droplet" "www" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l www ansible/setup_root.yml"
@@ -50,7 +50,7 @@ resource "digitalocean_droplet" "app-django" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l app-django ansible/setup_root.yml"
@@ -67,7 +67,7 @@ resource "digitalocean_droplet" "app-counts" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l app-counts ansible/setup_root.yml"
@@ -84,7 +84,7 @@ resource "digitalocean_droplet" "app-push" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l app-push ansible/setup_root.yml"
@@ -101,7 +101,7 @@ resource "digitalocean_droplet" "app-refresh" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l app-refresh ansible/setup_root.yml"
@@ -118,7 +118,7 @@ resource "digitalocean_droplet" "node-text" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l node-text ansible/setup_root.yml"
@@ -135,7 +135,7 @@ resource "digitalocean_droplet" "node-socket" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l node-socket ansible/setup_root.yml"
@@ -152,7 +152,7 @@ resource "digitalocean_droplet" "node-favicons" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l node-favicons ansible/setup_root.yml"
@@ -169,7 +169,7 @@ resource "digitalocean_droplet" "node-page" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l node-page ansible/setup_root.yml"
@@ -186,7 +186,7 @@ resource "digitalocean_droplet" "elasticsearch" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l elasticsearch ansible/setup_root.yml"
@@ -203,7 +203,7 @@ resource "digitalocean_droplet" "db-redis-user" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l db-redis-user ansible/setup_root.yml"
@@ -220,7 +220,7 @@ resource "digitalocean_droplet" "db-redis-sessions" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l db-redis-sessions ansible/setup_root.yml"
@@ -237,7 +237,7 @@ resource "digitalocean_droplet" "db-redis-story" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l db-redis-story ansible/setup_root.yml"
@@ -254,7 +254,7 @@ resource "digitalocean_droplet" "db-redis-pubsub" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l db-redis-pubsub ansible/setup_root.yml"
@@ -271,7 +271,7 @@ resource "digitalocean_droplet" "db-postgres" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l db-postgres ansible/setup_root.yml"
@@ -288,7 +288,7 @@ resource "digitalocean_droplet" "db-mongo" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l db-mongo ansible/setup_root.yml"
@@ -305,7 +305,7 @@ resource "digitalocean_droplet" "task" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l task ansible/setup_root.yml"
@@ -322,7 +322,7 @@ resource "digitalocean_droplet" "consul-manager" {
   size     = var.droplet_size
   ssh_keys = [digitalocean_ssh_key.default.fingerprint]
   provisioner "local-exec" {
-    command = "/srv/newsblur/ansible/generate.py; sleep 30"
+    command = "/srv/newsblur/ansible/generate.py; sleep 120"
   }
   provisioner "local-exec" {
     command = "cd ..; ansible-playbook -l consul-manager ansible/setup_root.yml"