summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-11-27 13:07:37 -0500
committerGitHub <noreply@github.com>2017-11-27 13:07:37 -0500
commit96bc873739197ea6aeb2712d6d26f6e3fd29e0d5 (patch)
tree765eb1dec5cb3de80e19768fc357c8c464008c4e /playbooks
parent9dbcf7bfda85d33f2d0d9653ab5a3cab714b3514 (diff)
parent94bbe2b08cec73b79d8c0755df45677229c35e34 (diff)
downloadopenshift-96bc873739197ea6aeb2712d6d26f6e3fd29e0d5.tar.gz
openshift-96bc873739197ea6aeb2712d6d26f6e3fd29e0d5.tar.bz2
openshift-96bc873739197ea6aeb2712d6d26f6e3fd29e0d5.tar.xz
openshift-96bc873739197ea6aeb2712d6d26f6e3fd29e0d5.zip
Merge pull request #6199 from mgugino-upstream-stage/master_sys_container
Simplify is_master_system_container logic
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/init/facts.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml
index 6368eaa88..820561b2b 100644
--- a/playbooks/init/facts.yml
+++ b/playbooks/init/facts.yml
@@ -29,7 +29,6 @@
- name: initialize_facts set fact for containerized and l_is_*_system_container
set_fact:
l_is_containerized: "{{ (l_is_atomic | bool) or (containerized | default(false) | bool) }}"
- l_is_master_system_container: "{{ (openshift_use_master_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
# TODO: Should this be moved into health checks??
# Seems as though any check that happens with a corresponding fail should move into health_checks
@@ -112,7 +111,6 @@
hostname: "{{ openshift_hostname | default(None) }}"
ip: "{{ openshift_ip | default(None) }}"
is_containerized: "{{ l_is_containerized | default(None) }}"
- is_master_system_container: "{{ l_is_master_system_container | default(false) }}"
public_hostname: "{{ openshift_public_hostname | default(None) }}"
public_ip: "{{ openshift_public_ip | default(None) }}"
portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}"