summaryrefslogtreecommitdiffstats
path: root/playbooks/init
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-11-20 17:20:25 -0500
committerMichael Gugino <mgugino@redhat.com>2017-11-21 16:23:37 -0500
commita1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1 (patch)
tree99ac77931e1770a6d45d07a5fd534460df7e1654 /playbooks/init
parent51a0cbd42807c91a5e30fa58362b8745a40607f2 (diff)
downloadopenshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.tar.gz
openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.tar.bz2
openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.tar.xz
openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.zip
Cleanup etcd runtime variable.
Cleaning out reference to etcd_runtime in openshift facts.
Diffstat (limited to 'playbooks/init')
-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 2523afbf1..a471d2281 100644
--- a/playbooks/init/facts.yml
+++ b/playbooks/init/facts.yml
@@ -33,11 +33,6 @@
l_is_openvswitch_system_container: "{{ (openshift_use_openvswitch_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
l_is_node_system_container: "{{ (openshift_use_node_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
@@ -137,8 +132,6 @@
is_openvswitch_system_container: "{{ l_is_openvswitch_system_container | default(false) }}"
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 }}"
public_hostname: "{{ openshift_public_hostname | default(None) }}"
public_ip: "{{ openshift_public_ip | default(None) }}"