Merge pull request #6005 from mgugino-upstream-stage/fix-master-version-detect

Automatic merge from submit-queue.

Fix master upgrade version detect and systemd enable

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508755
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509158

roles/openshift_facts/library/openshift_facts.py

@@ -1289,7 +1289,7 @@ def get_container_openshift_version(facts):
     If containerized, see if we can determine the installed version via the
     systemd environment files.
     """
-    for filename in ['/etc/sysconfig/%s-master', '/etc/sysconfig/%s-node']:
+    for filename in ['/etc/sysconfig/%s-master-controllers', '/etc/sysconfig/%s-node']:
         env_path = filename % facts['common']['service_type']
         if not os.path.exists(env_path):
             continue

roles/openshift_master/tasks/systemd_units.yml

@@ -58,6 +58,17 @@
   - l_create_ha_unit_files | changed
 # end workaround for missing systemd unit files
 
+- name: enable master services
+  systemd:
+    name: "{{ openshift.common.service_type }}-master-{{ item }}"
+    enabled: yes
+  with_items:
+  - api
+  - controllers
+  when:
+  - openshift.master.cluster_method == "native"
+  - not openshift.common.is_master_system_container | bool
+
 - name: Preserve Master API Proxy Config options
   command: grep PROXY /etc/sysconfig/{{ openshift.common.service_type }}-master-api
   register: l_master_api_proxy