From a6d1b54d83c6203c9a052375db94a2efccf9fd54 Mon Sep 17 00:00:00 2001 From: lipan Date: Mon, 30 May 2016 17:47:39 +0800 Subject: [PATCH 1/2] update networkd version --- playbooks/roles/bootstrap-images/vars/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/bootstrap-images/vars/main.yaml b/playbooks/roles/bootstrap-images/vars/main.yaml index bd9420c..ebd4c43 100644 --- 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", From 8e71dbbcd0bf42e41aadb8118569c536d6c87e57 Mon Sep 17 00:00:00 2001 From: lipan Date: Mon, 30 May 2016 17:48:19 +0800 Subject: [PATCH 2/2] do not change dnsmasq.servers at ensure stage --- playbooks/roles/dnsmasq/tasks/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/dnsmasq/tasks/main.yaml b/playbooks/roles/dnsmasq/tasks/main.yaml index 38d8c63..28cfbbd 100644 --- 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