summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/tasks
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-05-12 16:07:34 +0200
committerJan Chaloupka <jchaloup@redhat.com>2017-05-18 12:33:16 +0200
commit4fcbe72aeaf359d56ac636a8722f817ec10c629f (patch)
tree93436888a90064b447d60cfa7f365100b81af823 /roles/openshift_facts/tasks
parentf186712088f8e14d7f90a010d0f2cb250e24ee42 (diff)
downloadopenshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.tar.gz
openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.tar.bz2
openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.tar.xz
openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.zip
move etcd upgrade related code into etcd_upgrade role
Diffstat (limited to 'roles/openshift_facts/tasks')
-rw-r--r--roles/openshift_facts/tasks/main.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index f657d86cf..1b9bda67e 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -15,6 +15,9 @@
l_is_etcd_system_container: "{{ (use_etcd_system_container | default(use_system_containers) | bool) }}"
- set_fact:
l_any_system_container: "{{ l_is_etcd_system_container or l_is_openvswitch_system_container or l_is_node_system_container or l_is_master_system_container }}"
+- set_fact:
+ l_etcd_runtime: "{{ 'runc' if l_is_etcd_system_container else 'docker' if l_is_containerized else 'host' }}"
+
- name: Validate python version
fail:
@@ -80,6 +83,7 @@
is_node_system_container: "{{ l_is_node_system_container | default(false) }}"
is_master_system_container: "{{ l_is_master_system_container | default(false) }}"
is_etcd_system_container: "{{ l_is_etcd_system_container | default(false) }}"
+ etcd_runtime: "{{ l_etcd_runtime }}"
system_images_registry: "{{ system_images_registry | default('') }}"
public_hostname: "{{ openshift_public_hostname | default(None) }}"
public_ip: "{{ openshift_public_ip | default(None) }}"