From 7e2c88beadfdc788bcb207028fdd97fa7decf9f1 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Fri, 9 Jun 2017 15:30:54 +0200 Subject: set etcd working directory for embedded etcd --- roles/etcd_upgrade/defaults/main.yml | 4 ++-- roles/etcd_upgrade/meta/main.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'roles/etcd_upgrade') diff --git a/roles/etcd_upgrade/defaults/main.yml b/roles/etcd_upgrade/defaults/main.yml index 01ad8a268..b61bf526c 100644 --- a/roles/etcd_upgrade/defaults/main.yml +++ b/roles/etcd_upgrade/defaults/main.yml @@ -1,8 +1,8 @@ --- r_etcd_upgrade_action: upgrade r_etcd_upgrade_mechanism: rpm -r_etcd_upgrade_embedded_etcd: False - +r_etcd_upgrade_embedded_etcd: false +r_etcd_common_embedded_etcd: "{{ r_etcd_upgrade_embedded_etcd }}" # etcd run on a host => use etcdctl command directly # etcd run as a docker container => use docker exec # etcd run as a runc container => use runc exec diff --git a/roles/etcd_upgrade/meta/main.yml b/roles/etcd_upgrade/meta/main.yml index 018bdc8d7..afdb0267f 100644 --- a/roles/etcd_upgrade/meta/main.yml +++ b/roles/etcd_upgrade/meta/main.yml @@ -14,3 +14,4 @@ galaxy_info: - system dependencies: - role: etcd_common + r_etcd_common_embedded_etcd: "{{ r_etcd_upgrade_embedded_etcd }}" -- cgit v1.2.1