From 259272fa2359fd4d3bd78291bd0b06a1261c4b01 Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Thu, 16 Nov 2017 15:49:17 -0500
Subject: Remove all references to pacemaker (pcs, pcsd) and
 openshift.master.cluster_method.

With pacemaker removed there is no longer a need for
openshift.master.cluster_method. We only have one option.
---
 roles/openshift_master/tasks/systemd_units.yml | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'roles/openshift_master/tasks/systemd_units.yml')

diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml
index 9d11ed574..ee76413e3 100644
--- a/roles/openshift_master/tasks/systemd_units.yml
+++ b/roles/openshift_master/tasks/systemd_units.yml
@@ -25,7 +25,6 @@
     state: absent
   ignore_errors: true
   when:
-  - openshift.master.cluster_method == "native"
   - not l_is_master_system_container | bool
 
 # This is the image used for both HA and non-HA clusters:
@@ -43,7 +42,6 @@
     src: "{{ ha_svc_template_path }}/atomic-openshift-master-{{ item }}.service.j2"
     dest: "{{ containerized_svc_dir }}/{{ openshift.common.service_type }}-master-{{ item }}.service"
   when:
-  - openshift.master.cluster_method == "native"
   - not l_is_master_system_container | bool
   with_items:
   - api
@@ -63,22 +61,17 @@
   - api
   - controllers
   when:
-  - openshift.master.cluster_method == "native"
   - 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
   register: l_master_api_proxy
-  when:
-  - openshift.master.cluster_method == "native"
   failed_when: false
   changed_when: false
 
 - name: Preserve Master API AWS options
   command: grep AWS_ /etc/sysconfig/{{ openshift.common.service_type }}-master-api
   register: master_api_aws
-  when:
-  - openshift.master.cluster_method == "native"
   failed_when: false
   changed_when: false
 
@@ -87,14 +80,11 @@
     src: "{{ ha_svc_template_path }}/atomic-openshift-master-api.j2"
     dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-api
     backup: true
-  when:
-  - openshift.master.cluster_method == "native"
   notify:
   - restart master api
 
 - name: Restore Master API Proxy Config Options
   when:
-  - openshift.master.cluster_method == "native"
   - l_master_api_proxy.rc == 0
   - "'http_proxy' not in openshift.common"
   - "'https_proxy' not in openshift.common"
@@ -105,7 +95,6 @@
 
 - name: Restore Master API AWS Options
   when:
-  - openshift.master.cluster_method == "native"
   - master_api_aws.rc == 0
   - not (openshift_cloudprovider_kind is defined and openshift_cloudprovider_kind == 'aws' and openshift_cloudprovider_aws_access_key is defined and openshift_cloudprovider_aws_secret_key is defined)
   lineinfile:
@@ -117,16 +106,12 @@
 - name: Preserve Master Controllers Proxy Config options
   command: grep PROXY /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
   register: master_controllers_proxy
-  when:
-  - openshift.master.cluster_method == "native"
   failed_when: false
   changed_when: false
 
 - name: Preserve Master Controllers AWS options
   command: grep AWS_ /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
   register: master_controllers_aws
-  when:
-  - openshift.master.cluster_method == "native"
   failed_when: false
   changed_when: false
 
@@ -135,8 +120,6 @@
     src: "{{ ha_svc_template_path }}/atomic-openshift-master-controllers.j2"
     dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
     backup: true
-  when:
-  - openshift.master.cluster_method == "native"
   notify:
   - restart master controllers
 
@@ -146,7 +129,6 @@
     line: "{{ item }}"
   with_items: "{{ master_controllers_proxy.stdout_lines | default([]) }}"
   when:
-  - openshift.master.cluster_method == "native"
   - master_controllers_proxy.rc == 0
   - "'http_proxy' not in openshift.common"
   - "'https_proxy' not in openshift.common"
@@ -157,6 +139,5 @@
     line: "{{ item }}"
   with_items: "{{ master_controllers_aws.stdout_lines | default([]) }}"
   when:
-  - openshift.master.cluster_method == "native"
   - master_controllers_aws.rc == 0
   - not (openshift_cloudprovider_kind is defined and openshift_cloudprovider_kind == 'aws' and openshift_cloudprovider_aws_access_key is defined and openshift_cloudprovider_aws_secret_key is defined)
-- 
cgit v1.2.1