Master services are gone in 3.10

playbooks/adhoc/uninstall_openshift.yml

@@ -49,23 +49,6 @@
     failed_when: false
     when: openshift_use_openshift_sdn | default(True) | bool
 
-- hosts: masters
-  become: yes
-  tasks:
-  - name: Stop services
-    service: name={{ item }} state=stopped
-    with_items:
-    - atomic-openshift-master
-    - atomic-openshift-master-api
-    - atomic-openshift-master-controllers
-    - openshift-master
-    - openshift-master-api
-    - openshift-master-controllers
-    - origin-master
-    - origin-master-api
-    - origin-master-controllers
-    failed_when: false
-
 - hosts: etcd
   become: yes
   tasks:
@@ -175,27 +158,6 @@
 
     when: openshift_remove_all | default(true) | bool
 
-  - shell: atomic uninstall "{{ item }}"-master-api
-    changed_when: False
-    failed_when: False
-    with_items:
-    - openshift-enterprise
-    - origin
-
-  - shell: atomic uninstall "{{ item }}"-master-controllers
-    changed_when: False
-    failed_when: False
-    with_items:
-    - openshift-enterprise
-    - origin
-
-  - shell: atomic uninstall "{{ item }}"-master
-    changed_when: False
-    failed_when: False
-    with_items:
-    - openshift-enterprise
-    - origin
-
   - shell: atomic uninstall "{{ item }}"-node
     changed_when: False
     failed_when: False
@@ -427,28 +389,7 @@
     with_items:
     - /etc/ansible/facts.d/openshift.fact
     - /etc/corosync
-    - /etc/openshift
-    - /etc/openshift-sdn
-    - /etc/systemd/system/atomic-openshift-master.service
-    - /etc/systemd/system/atomic-openshift-master-api.service
-    - /etc/systemd/system/atomic-openshift-master-controllers.service
-    - /etc/systemd/system/origin-master.service
-    - /etc/systemd/system/origin-master-api.service
-    - /etc/systemd/system/origin-master-controllers.service
-    - /etc/sysconfig/atomic-openshift-master-api
-    - /etc/sysconfig/atomic-openshift-master-controllers
-    - /etc/sysconfig/origin-master
-    - /etc/sysconfig/origin-master-api
-    - /etc/sysconfig/origin-master-controllers
-    - /etc/sysconfig/openshift-master
-    - /etc/sysconfig/origin-master
-    - /etc/sysconfig/origin-master-api
-    - /etc/sysconfig/origin-master-controllers
     - /usr/share/openshift/examples
-    - /usr/lib/systemd/system/atomic-openshift-master-api.service
-    - /usr/lib/systemd/system/atomic-openshift-master-controllers.service
-    - /usr/lib/systemd/system/origin-master-api.service
-    - /usr/lib/systemd/system/origin-master-controllers.service
     - /usr/local/bin/openshift
     - /usr/local/bin/oadm
     - /usr/local/bin/oc
@@ -461,12 +402,6 @@
     - /etc/systemd/system/openvswitch.service
     when: openshift_use_openshift_sdn | default(True) | bool
 
-  # Since we are potentially removing the systemd unit files for separated
-  # master-api and master-controllers services, so we need to reload the
-  # systemd configuration manager
-  - name: Reload systemd manager configuration
-    command: systemctl daemon-reload
-
 - hosts: etcd
   become: yes
   vars:

playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml

@@ -1,17 +1,6 @@
 ---
 # We need docker service up to remove all the images, but these services will keep
 # trying to re-start and thus re-pull the images we're trying to delete.
-- name: Stop containerized services
-  service: name={{ item }} state=stopped
-  with_items:
-  - "{{ openshift_service_type }}-master-api"
-  - "{{ openshift_service_type }}-master-controllers"
-  - "{{ openshift_service_type }}-node"
-  - etcd_container
-  - openvswitch
-  failed_when: false
-  when: openshift_is_containerized | bool
-
 - name: Restart static master services
   command: /usr/local/bin/master-restart "{{ item }}"
   with_items:

playbooks/common/openshift-cluster/upgrades/pre/verify_cluster.yml

@@ -74,32 +74,3 @@
       role: master
       local_facts:
         ha: "{{ groups.oo_masters_to_config | length > 1 }}"
-
-  - when:
-    - openshift_is_containerized | bool
-    - not openshift_is_bootstrapped | bool
-    block:
-    - set_fact:
-        master_services:
-        - "{{ openshift_service_type }}-master"
-
-    # In case of the non-ha to ha upgrade.
-    - name: Check if the {{ openshift_service_type }}-master-api.service exists
-      command: >
-        systemctl list-units {{ openshift_service_type }}-master-api.service --no-legend
-      register: master_api_service_status
-
-    - set_fact:
-        master_services:
-        - "{{ openshift_service_type }}-master-api"
-        - "{{ openshift_service_type }}-master-controllers"
-      when:
-      - master_api_service_status.stdout_lines | length > 0
-      - (openshift_service_type + '-master-api.service') in master_api_service_status.stdout_lines[0]
-
-    - name: Ensure Master is running
-      service:
-        name: "{{ item }}"
-        state: started
-        enabled: yes
-      with_items: "{{ master_services }}"

roles/openshift_control_plane/tasks/check_master_api_is_ready.yml

@@ -8,14 +8,15 @@
   retries: 60
   delay: 5
 
-- name: "Collect API logs when API didn't become available"
-  command: journalctl --no-pager -n 100 -u {{ openshift_service_type }}-master-api
-  register: l_api_log_output
+- name: Get API logs
+  command: >
+    /usr/local/bin/master-logs api api
+  register: control_plane_logs_api
+  ignore_errors: true
   when: openshift_apis is failed
 
-- name: "Dump API logs when the API didn't become availabale"
-  debug:
-    msg: "{{ l_api_log_output.stdout_lines }}"
+- debug:
+    msg: "{{ control_plane_logs_api.stdout_lines }}"
   when: openshift_apis is failed
 
 - fail:

roles/openshift_control_plane/tasks/static.yml

@@ -71,14 +71,6 @@
   - apiserver.yaml
   - controller.yaml
 
-- name: Remove old files in /etc/sysconfig
-  file:
-    name: "{{ item }}"
-    state: absent
-  with_items:
-  - /etc/sysconfig/{{ openshift_service_type }}-master-api
-  - /etc/sysconfig/{{ openshift_service_type }}-master-controllers
-
 - name: Remove temporary directory
   file:
     name: "{{ mktemp.stdout }}"

roles/openshift_control_plane/tasks/upgrade.yml

@@ -1,13 +1,4 @@
 ---
-- name: Stop control plane services
-  service:
-    name: "{{ item }}"
-    state: stopped
-  with_items:
-  - "{{ openshift_service_type }}-master-api"
-  - "{{ openshift_service_type }}-master-controllers"
-  failed_when: false
-
 - import_tasks: static_shim.yml
 
 - import_tasks: upgrade/upgrade_scheduler.yml
@@ -87,6 +78,3 @@
     key: "kubernetesMasterConfig.apiServerArguments.runtime-config"
     value: "{{ runtime_config.result | join(',') | regex_replace('(?:,)*apis/settings\\.k8s\\.io/v1alpha1=true','') }}"
   when: runtime_config.result
-
-- name: reload systemd units
-  command: systemctl daemon-reload