fix consul service start

RebelMouseTeam · Mar 27, 2018 · 70190ce · 70190ce
1 parent 7afb4ea
commit 70190ce
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,9 +1,12 @@
 ---
 consul_mode: "client"
-consul_dnsmasq: yes
 consul_service_enabled: no
 consul_service_started: no
 
+consul_dnsmasq: yes
+consul_dnsmasq_service_enabled: no
+consul_dnsmasq_service_started: no
+
 consul_src: https://releases.hashicorp.com/consul/0.9.3/consul_0.9.3_linux_amd64.zip
 consul_dest: /usr/local/bin
 

diff --git a/handlers/main.yml b/handlers/main.yml
@@ -3,10 +3,11 @@
   service:
     name: dnsmasq
     state: restarted
-  when: lookup('env', 'MOLECULE_DRIVER_NAME') != 'docker'
+  when: consul_service_started and lookup('env', 'MOLECULE_DRIVER_NAME') != 'docker'
+
 
 - name: restart consul
   service:
     name: consul
     state: restarted
-  when: lookup('env', 'MOLECULE_DRIVER_NAME') != 'docker'
+  when: consul_service_started and lookup('env', 'MOLECULE_DRIVER_NAME') != 'docker'
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -108,6 +108,11 @@
     mode: 0644
   when: ansible_distribution_release == 'trusty'
 
+- include: dnsmasq.yml
+  when: consul_dnsmasq
+  tags:
+    - dnsmasq
+
 - name: enable consul
   service:
     name: consul
@@ -116,15 +121,26 @@
   tags:
     - service
 
-- name: start consul
+- name: start/stop consul service
   service:
     name: consul
-    state: started
-  when: consul_service_started
+    state: '{{ "started" if consul_service_started else "stopped" }}'
+  when: lookup('env', 'MOLECULE_DRIVER_NAME') != 'docker'
   tags:
     - service
 
-- include: dnsmasq.yml
-  when: consul_dnsmasq
+- name: enable dnsmasq
+  service:
+    name: dnsmasq
+    enabled: "{{ consul_dnsmasq_service_enabled }}"
+  when: consul_dnsmasq and lookup('env', 'MOLECULE_DRIVER_NAME') != 'docker'
   tags:
-    - dnsmasq
+    - service
+
+- name: start/stop dnsmasq service
+  service:
+    name: dnsmasq
+    state: '{{ "started" if consul_dnsmasq_service_started else "stopped" }}'
+  when: consul_dnsmasq and lookup('env', 'MOLECULE_DRIVER_NAME') != 'docker'
+  tags:
+    - service