From fc181665d30ddc3c98fb2b4afe2c6849d8f6d4dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Leo=CC=81n?= Date: Tue, 28 Jun 2016 12:09:39 +0200 Subject: [PATCH] Rename clusterstore variable to docker_clustertore --- defaults/main.yml | 2 +- templates/daemon.j2.json | 2 +- tests/vagrant.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b2f7dfd..3d42aff 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,4 +1,4 @@ --- docker_rc: no -clusterstore: no +docker_clusterstore: no consul_ip: 127.0.0.1 diff --git a/templates/daemon.j2.json b/templates/daemon.j2.json index 3f38696..5549cd8 100644 --- a/templates/daemon.j2.json +++ b/templates/daemon.j2.json @@ -1,5 +1,5 @@ { -{% if clusterstore %} +{% if docker_clusterstore %} "cluster-store": "consul://{{ consul_ip }}:8500", {% endif %} "log-level": "info" diff --git a/tests/vagrant.yml b/tests/vagrant.yml index f6932e9..4ceec70 100644 --- a/tests/vagrant.yml +++ b/tests/vagrant.yml @@ -3,7 +3,7 @@ become: yes become_user: root vars: - - clusterstore: yes + docker_clusterstore: yes roles: - ../docker tasks: