summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-08-25 08:42:20 -0400
committerAndrew Butcher <abutcher@redhat.com>2015-11-04 19:57:22 -0500
commit18c877db73dcb63b1402322fe8352505006e4985 (patch)
tree62534068df31898f763d791370455a9e7f574176 /roles/openshift_master/tasks
parent51bcc78aea4015bf23d06b621b57de675b21e7cf (diff)
downloadopenshift-18c877db73dcb63b1402322fe8352505006e4985.tar.gz
openshift-18c877db73dcb63b1402322fe8352505006e4985.tar.bz2
openshift-18c877db73dcb63b1402322fe8352505006e4985.tar.xz
openshift-18c877db73dcb63b1402322fe8352505006e4985.zip
additional ha related updates
Diffstat (limited to 'roles/openshift_master/tasks')
-rw-r--r--roles/openshift_master/tasks/main.yml84
1 files changed, 83 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index f11582ce7..b23c19d37 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -91,6 +91,8 @@
creates: "{{ openshift_master_policy }}"
notify:
- restart master
+ - restart master api
+ - restart master controllers
- name: Create the scheduler config
template:
@@ -99,6 +101,8 @@
backup: true
notify:
- restart master
+ - restart master api
+ - restart master controllers
- name: Install httpd-tools if needed
yum: pkg=httpd-tools state=present
@@ -121,6 +125,30 @@
when: item.kind == 'HTPasswdPasswordIdentityProvider'
with_items: openshift.master.identity_providers
+# workaround for missing systemd unit files for controllers/api
+- name: Create the api service file
+ copy:
+ src: atomic-openshift-master-api.service
+ dest: /usr/lib/systemd/system/atomic-openshift-master-api.service
+ force: no
+- name: Create the controllers service file
+ copy:
+ src: atomic-openshift-master-controllers.service
+ dest: /usr/lib/systemd/system/atomic-openshift-master-controllers.service
+ force: no
+- name: Create the api env file
+ copy:
+ src: atomic-openshift-master-api
+ dest: /etc/sysconfig/atomic-openshift-master-api
+ force: no
+- name: Create the controllers env file
+ copy:
+ src: atomic-openshift-master-controllers
+ dest: /etc/sysconfig/atomic-openshift-master-controllers
+ force: no
+- command: systemctl daemon-reload
+# end workaround for missing systemd unit files
+
# TODO: add the validate parameter when there is a validation command to run
- name: Create master config
template:
@@ -129,6 +157,8 @@
backup: true
notify:
- restart master
+ - restart master api
+ - restart master controllers
- name: Configure master settings
lineinfile:
@@ -143,9 +173,61 @@
notify:
- restart master
+- name: Configure master api settings
+ lineinfile:
+ dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-api
+ regexp: "{{ item.regex }}"
+ line: "{{ item.line }}"
+ with_items:
+ - regex: '^OPTIONS='
+ line: "OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen=https://0.0.0.0:8443 --master=https://{{ openshift.common.ip }}:8443"
+ - regex: '^CONFIG_FILE='
+ line: "CONFIG_FILE={{ openshift_master_config_file }}"
+ notify:
+ - restart master api
+
+- name: Configure master controller settings
+ lineinfile:
+ dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
+ regexp: "{{ item.regex }}"
+ line: "{{ item.line }}"
+ with_items:
+ - regex: '^OPTIONS='
+ line: "OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen=https://0.0.0.0:8444"
+ - regex: '^CONFIG_FILE='
+ line: "CONFIG_FILE={{ openshift_master_config_file }}"
+ notify:
+ - restart master controllers
+
- name: Start and enable master
service: name={{ openshift.common.service_type }}-master enabled=yes state=started
-# when: not openshift_master_ha | bool
+ when: not openshift_master_ha | bool
+ register: start_result
+
+# workaround for start bug when configuring ha
+- name: Start master for ha workaround
+ service: name={{ openshift.common.service_type }}-master state=started
+ when: openshift_master_ha | bool and inventory_hostname in groups.oo_first_master
+
+- name: pause for 30 seconds to let master finish starting up for ha workaround
+ pause: seconds=30
+ when: openshift_master_ha | bool and inventory_hostname in groups.oo_first_master
+
+- name: Stop master for ha workaround
+ service: name={{ openshift.common.service_type }}-master state=stopped
+ when: openshift_master_ha | bool and inventory_hostname in groups.oo_first_master
+# end workaround for start bug when configuring ha
+
+- fail:
+
+- name: Start and enable master api
+ service: name={{ openshift.common.service_type }}-master-api enabled=yes state=started
+ when: openshift_master_ha | bool
+ register: start_result
+
+- name: Start and enable master controller
+ service: name={{ openshift.common.service_type }}-master-controllers enabled=yes state=started
+ when: openshift_master_ha | bool
register: start_result
- set_fact: