remove master.service during the non-ha to ha upgrade

roles/openshift_master/tasks/clean_systemd_units.yml

@@ -1,9 +0,0 @@
----
-
-- name: Disable master service
-  systemd:
-    name: "{{ openshift.common.service_type }}-master"
-    state: stopped
-    enabled: no
-    masked: yes
-  ignore_errors: true

roles/openshift_master/tasks/systemd_units.yml

@@ -14,8 +14,22 @@
 
 - include: registry_auth.yml
 
+- name: Disable the legacy master service if it exists
+  systemd:
+    name: "{{ openshift.common.service_type }}-master"
+    state: stopped
+    enabled: no
+    masked: yes
+  ignore_errors: true
+
 - name: Remove the legacy master service if it exists
-  include: clean_systemd_units.yml
+  file:
+    path: "{{ containerized_svc_dir }}/{{ openshift.common.service_type }}-master.service"
+    state: absent
+  ignore_errors: true
+  when:
+  - openshift.master.cluster_method == "native"
+  - not openshift.common.is_master_system_container | bool
 
 # This is the image used for both HA and non-HA clusters:
 - name: Pre-pull master image