14 files changed, 24 insertions, 22 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 69ee62790..55052b0a3 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -2,7 +2,7 @@
 # These tasks dispatch to the proper set of docker tasks based on the
 # inventory:openshift_docker_use_system_container variable
 
-- include: udev_workaround.yml
+- include_tasks: udev_workaround.yml
   when: docker_udev_workaround | default(False) | bool
 
 - set_fact:
@@ -20,7 +20,7 @@
     - not l_use_crio_only
 
 - name: Use Package Docker if Requested
-  include: package_docker.yml
+  include_tasks: package_docker.yml
   when:
     - not l_use_system_container
     - not l_use_crio_only
@@ -35,13 +35,13 @@
   changed_when: false
 
 - name: Use System Container Docker if Requested
-  include: systemcontainer_docker.yml
+  include_tasks: systemcontainer_docker.yml
   when:
     - l_use_system_container
     - not l_use_crio_only
 
 - name: Add CRI-O usage Requested
-  include: systemcontainer_crio.yml
+  include_tasks: systemcontainer_crio.yml
   when:
     - l_use_crio
     - openshift_docker_is_node_or_master | bool
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml
index 8121163a6..e6c3fe4d7 100644
--- a/roles/docker/tasks/package_docker.yml
+++ b/roles/docker/tasks/package_docker.yml
@@ -157,4 +157,4 @@
 - meta: flush_handlers
 
 # This needs to run after docker is restarted to account for proxy settings.
-- include: registry_auth.yml
+- include_tasks: registry_auth.yml
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index 3fe10454d..3e5bdf32c 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/roles/docker/tasks/systemcontainer_crio.yml
@@ -162,7 +162,7 @@
     state: directory
 
 - name: setup firewall for CRI-O
-  include: crio_firewall.yml
+  include_tasks: crio_firewall.yml
   static: yes
 
 - name: Configure the CNI network
@@ -182,6 +182,6 @@
 
 # If we are using crio only, docker.service might not be available for
 # 'docker login'
-- include: registry_auth.yml
+- include_tasks: registry_auth.yml
   vars:
     openshift_docker_alternative_creds: "{{ l_use_crio_only }}"
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml
index 84220fa66..f69acb9a5 100644
--- a/roles/docker/tasks/systemcontainer_docker.yml
+++ b/roles/docker/tasks/systemcontainer_docker.yml
@@ -177,6 +177,6 @@
 
 # Since docker is running as a system container, docker login will fail to create
 # credentials.  Use alternate method if requiring authenticated registries.
-- include: registry_auth.yml
+- include_tasks: registry_auth.yml
   vars:
     openshift_docker_alternative_creds: True
diff --git a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
index 5a196eff2..205719215 100644
--- a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
+++ b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
@@ -58,7 +58,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_loadbalancer': {
                 'title': 'Load balancer Install',
-                'playbook': 'playbooks/byo/openshift-loadbalancer/config.yml'
+                'playbook': 'playbooks/openshift-loadbalancer/config.yml'
             },
             'installer_phase_master': {
                 'title': 'Master Install',
@@ -70,7 +70,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_node': {
                 'title': 'Node Install',
-                'playbook': 'playbooks/byo/openshift-node/config.yml'
+                'playbook': 'playbooks/openshift-node/config.yml'
             },
             'installer_phase_glusterfs': {
                 'title': 'GlusterFS Install',
@@ -82,7 +82,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_metrics': {
                 'title': 'Metrics Install',
-                'playbook': 'playbooks/byo/openshift-cluster/openshift-metrics.yml'
+                'playbook': 'playbooks/openshift-metrics/config.yml'
             },
             'installer_phase_logging': {
                 'title': 'Logging Install',
diff --git a/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2 b/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2
index 5a4f7f762..8529b61d5 100644
--- a/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2
+++ b/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2
@@ -42,7 +42,7 @@ objects:
         component: eventrouter
         logging-infra: eventrouter
         provider: openshift
-      replicas: ${REPLICAS}
+      replicas: "${{ '{{' }}REPLICAS{{ '}}' }}"
       template:
         metadata:
           labels:
diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2
index cfb13d59b..79e449b73 100644
--- a/roles/openshift_logging_mux/templates/mux.j2
+++ b/roles/openshift_logging_mux/templates/mux.j2
@@ -59,7 +59,7 @@ spec:
 {%   endif %}
 {% endif %}
         ports:
-        - containerPort: "{{ openshift_logging_mux_port }}"
+        - containerPort: {{ openshift_logging_mux_port }}
           name: mux-forward
         volumeMounts:
         - name: config
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index 89d154ad7..816338fa1 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -4,6 +4,8 @@ openshift_node_debug_level: "{{ debug_level | default(2) }}"
 r_openshift_node_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
 r_openshift_node_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}"
 
+l_is_node_system_container: "{{ (openshift_use_node_system_container | default(openshift_use_system_containers | default(false)) | bool) }}"
+
 openshift_deployment_type: "{{ openshift_deployment_type | default('origin') }}"
 openshift_service_type: "{{ 'origin' if openshift_deployment_type == 'origin' else 'atomic-openshift' }}"
 
diff --git a/roles/openshift_node/tasks/install.yml b/roles/openshift_node/tasks/install.yml
index 6b7e40491..9a91e2fb6 100644
--- a/roles/openshift_node/tasks/install.yml
+++ b/roles/openshift_node/tasks/install.yml
@@ -20,7 +20,7 @@
 
 - when:
   - openshift.common.is_containerized | bool
-  - not openshift.common.is_node_system_container | bool
+  - not l_is_node_system_container | bool
   block:
   - name: Pre-pull node image when containerized
     command: >
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index 9c182ade6..9b4c24dfe 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -3,7 +3,7 @@
   template:
     dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service"
     src: "{{ openshift.common.is_containerized | bool | ternary('openshift.docker.node.service', 'node.service.j2') }}"
-  when: not openshift.common.is_node_system_container | bool
+  when: not l_is_node_system_container | bool
   notify:
   - reload systemd units
   - restart node
@@ -19,7 +19,7 @@
   - name: Install Node system container
     include: node_system_container.yml
     when:
-    - openshift.common.is_node_system_container | bool
+    - l_is_node_system_container | bool
 
   - name: Install OpenvSwitch system containers
     include: openvswitch_system_container.yml
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml
index 95ba9fe4c..552a22a0f 100644
--- a/roles/openshift_repos/tasks/main.yaml
+++ b/roles/openshift_repos/tasks/main.yaml
@@ -35,7 +35,7 @@
   - when: r_openshift_repos_has_run is not defined
     block:
 
-    - include: centos_repos.yml
+    - include_tasks: centos_repos.yml
       when:
       - ansible_os_family == "RedHat"
       - ansible_distribution != "Fedora"
diff --git a/roles/openshift_sanitize_inventory/tasks/deprecations.yml b/roles/openshift_sanitize_inventory/tasks/deprecations.yml
index 94d3acffc..795b8ee60 100644
--- a/roles/openshift_sanitize_inventory/tasks/deprecations.yml
+++ b/roles/openshift_sanitize_inventory/tasks/deprecations.yml
@@ -16,6 +16,6 @@
 
 # for with_fileglob Ansible resolves the path relative to the roles/<rolename>/files directory
 - name: Assign deprecated variables to correct counterparts
-  include: "{{ item }}"
+  include_tasks: "{{ item }}"
   with_fileglob:
   - "../tasks/__deprecations_*.yml"
diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml
index 70b236033..77428272c 100644
--- a/roles/openshift_sanitize_inventory/tasks/main.yml
+++ b/roles/openshift_sanitize_inventory/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # We should print out deprecations prior to any failures so that if a play does fail for other reasons
 # the user would also be aware of any deprecated variables they should note to adjust
-- include: deprecations.yml
+- include_tasks: deprecations.yml
 
 - name: Abort when conflicting deployment type variables are set
   when:
@@ -53,7 +53,7 @@
       openshift_release is "{{ openshift_release }}" which is not a valid version string.
       Please set it to a version string like "3.4".
 
-- include: unsupported.yml
+- include_tasks: unsupported.yml
   when:
     - not openshift_enable_unsupported_configurations | default(false) | bool
 
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml
index 1c8b9046c..4f9158ade 100644
--- a/roles/openshift_version/tasks/main.yml
+++ b/roles/openshift_version/tasks/main.yml
@@ -93,11 +93,11 @@
   - inventory_hostname in groups['oo_masters_to_config'] or inventory_hostname in groups['oo_nodes_to_config']
   block:
   - name: Set openshift_version for rpm installation
-    include: set_version_rpm.yml
+    include_tasks: set_version_rpm.yml
     when: not is_containerized | bool
 
   - name: Set openshift_version for containerized installation
-    include: set_version_containerized.yml
+    include_tasks: set_version_containerized.yml
     when: is_containerized | bool
 
   - block: