summaryrefslogtreecommitdiffstats
path: root/playbooks/init/facts.yml
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-11-22 09:08:19 -0500
committerGitHub <noreply@github.com>2017-11-22 09:08:19 -0500
commit4f83051b3b7c80e3ad71fc28108cd1fc3646b385 (patch)
treeee55d37f54a05008201b29b8afcd22cf2d4ac234 /playbooks/init/facts.yml
parent46ce19180bf4fe05327ab8a15bb689d908779e75 (diff)
parenta1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1 (diff)
downloadopenshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.tar.gz
openshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.tar.bz2
openshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.tar.xz
openshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.zip
Merge pull request #6193 from mgugino-upstream-stage/etc-runtime
Cleanup etcd runtime variable.
Diffstat (limited to 'playbooks/init/facts.yml')
-rw-r--r--playbooks/init/facts.yml7
1 files changed, 0 insertions, 7 deletions
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml
index 0899cc48c..c9a3448c7 100644
--- a/playbooks/init/facts.yml
+++ b/playbooks/init/facts.yml
@@ -31,11 +31,6 @@
l_is_containerized: "{{ (l_is_atomic | bool) or (containerized | default(false) | bool) }}"
l_is_openvswitch_system_container: "{{ (openshift_use_openvswitch_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
l_is_master_system_container: "{{ (openshift_use_master_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
- l_is_etcd_system_container: "{{ (openshift_use_etcd_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
-
- - name: initialize_facts set fact for l_etcd_runtime
- set_fact:
- l_etcd_runtime: "{{ 'runc' if l_is_etcd_system_container else 'docker' if l_is_containerized else 'host' }}"
# TODO: Should this be moved into health checks??
# Seems as though any check that happens with a corresponding fail should move into health_checks
@@ -134,8 +129,6 @@
is_containerized: "{{ l_is_containerized | default(None) }}"
is_openvswitch_system_container: "{{ l_is_openvswitch_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 }}"
public_hostname: "{{ openshift_public_hostname | default(None) }}"
public_ip: "{{ openshift_public_ip | default(None) }}"