From 85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Mon, 20 Nov 2017 17:43:08 -0500 Subject: Refactor etcd image Simplify logic for etcd_image --- roles/etcd/defaults/main.yaml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'roles/etcd/defaults/main.yaml') diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml index 4b734d4ed..9a3652a2b 100644 --- a/roles/etcd/defaults/main.yaml +++ b/roles/etcd/defaults/main.yaml @@ -6,6 +6,12 @@ r_etcd_common_backup_sufix_name: '' r_etcd_common_etcd_runtime: "docker" r_etcd_common_embedded_etcd: false +osm_etcd_image: 'registry.access.redhat.com/rhel7/etcd' +etcd_image_dict: + origin: "registry.fedoraproject.org/f26/etcd" + openshift-enterprise: "{{ osm_etcd_image }}" +etcd_image: "{{ etcd_image_dict[openshift_deployment_type | default('origin')] }}" + # 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 -- cgit v1.2.3