Merge pull request #61 from panli889/master

update networkd version, do not change dnsmasq.servers at ensure stage
laincloud · May 30, 2016 · f881e10 · f881e10
2 parents 81cd449 + 8e71dbb
commit f881e10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/playbooks/roles/bootstrap-images/vars/main.yaml b/playbooks/roles/bootstrap-images/vars/main.yaml
@@ -7,7 +7,7 @@
     "swarm": "swarm:1.2.0",
     "rebellion": "rebellion:2.0.2",
     "pip_binary": "pip-binary:1462951953",
-    "networkd-binary": "networkd-binary:0.1.12",
+    "networkd-binary": "networkd-binary:0.1.16",
     "deployd-binary": "deployd:2.0.2",
     "lainlet": "lainlet:2.0.2",
     "registry": "registry:release-1464060746-b1033b6544555a0b7e8775a994b8a891aaab0a11",

diff --git a/playbooks/roles/dnsmasq/tasks/main.yaml b/playbooks/roles/dnsmasq/tasks/main.yaml
@@ -19,7 +19,7 @@
 
 - name: ensure /etc/dnsmasq.servers
   template: src=dnsmasq.servers.conf.j2 dest=/etc/dnsmasq.servers
-  when: result|success
+  when: result|success and bootstrapping|bool
 
 - name: ensure /etc/dnsmasq.servers
   file: path="{{ dnsmasq_servers_path }}" state=touch