From 94bbe2b08cec73b79d8c0755df45677229c35e34 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Mon, 20 Nov 2017 18:10:47 -0500
Subject: Simplify is_master_system_container logic

Simplify the variable is_master_system_container
---
 playbooks/init/facts.yml                       | 2 --
 roles/openshift_master/defaults/main.yml       | 2 ++
 roles/openshift_master/tasks/main.yml          | 2 +-
 roles/openshift_master/tasks/systemd_units.yml | 8 ++++----
 4 files changed, 7 insertions(+), 7 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) }}"
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index 99bc12514..e9a51e55b 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -13,6 +13,8 @@ system_images_registry_dict:
 
 system_images_registry: "{{ system_images_registry_dict[openshift_deployment_type | default('origin')] }}"
 
+l_is_master_system_container: "{{ (openshift_use_master_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
+
 openshift_node_ips: []
 r_openshift_master_clean_install: false
 r_openshift_master_etcd3_storage: false
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index e2f92d597..d570a1c7f 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -180,7 +180,7 @@
   include_tasks: system_container.yml
   when:
   - openshift.common.is_containerized | bool
-  - openshift.common.is_master_system_container | bool
+  - l_is_master_system_container | bool
 
 - name: Create session secrets file
   template:
diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml
index 582185198..9d11ed574 100644
--- a/roles/openshift_master/tasks/systemd_units.yml
+++ b/roles/openshift_master/tasks/systemd_units.yml
@@ -26,7 +26,7 @@
   ignore_errors: true
   when:
   - openshift.master.cluster_method == "native"
-  - not openshift.common.is_master_system_container | bool
+  - not l_is_master_system_container | bool
 
 # This is the image used for both HA and non-HA clusters:
 - name: Pre-pull master image
@@ -36,7 +36,7 @@
   changed_when: "'Downloaded newer image' in l_pull_result.stdout"
   when:
   - openshift.common.is_containerized | bool
-  - not openshift.common.is_master_system_container | bool
+  - not l_is_master_system_container | bool
 
 - name: Create the ha systemd unit files
   template:
@@ -44,7 +44,7 @@
     dest: "{{ containerized_svc_dir }}/{{ openshift.common.service_type }}-master-{{ item }}.service"
   when:
   - openshift.master.cluster_method == "native"
-  - not openshift.common.is_master_system_container | bool
+  - not l_is_master_system_container | bool
   with_items:
   - api
   - controllers
@@ -64,7 +64,7 @@
   - controllers
   when:
   - openshift.master.cluster_method == "native"
-  - not openshift.common.is_master_system_container | bool
+  - not l_is_master_system_container | bool
 
 - name: Preserve Master API Proxy Config options
   command: grep PROXY /etc/sysconfig/{{ openshift.common.service_type }}-master-api
-- 
cgit v1.2.1