From a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Mon, 20 Nov 2017 17:20:25 -0500 Subject: Cleanup etcd runtime variable. Cleaning out reference to etcd_runtime in openshift facts. --- roles/etcd/defaults/main.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'roles/etcd/defaults') diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml index 9a3652a2b..a069e4d87 100644 --- a/roles/etcd/defaults/main.yaml +++ b/roles/etcd/defaults/main.yaml @@ -2,8 +2,10 @@ r_etcd_common_backup_tag: '' r_etcd_common_backup_sufix_name: '' +l_is_etcd_system_container: "{{ (openshift_use_etcd_system_container | default(openshift_use_system_containers | default(false)) | bool) }}" + # runc, docker, host -r_etcd_common_etcd_runtime: "docker" +r_etcd_common_etcd_runtime: "{{ 'runc' if l_is_etcd_system_container else 'docker' if l_is_containerized else 'host' }}" r_etcd_common_embedded_etcd: false osm_etcd_image: 'registry.access.redhat.com/rhel7/etcd' -- cgit v1.2.3