diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-04-25 12:09:02 -0500 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-04-28 10:50:13 -0500 |
| commit | 8b5dd3feeede035ddc0b66ad0b4008a5edba1a07 (patch) | |
| tree | 73ee893e4fa8ee56d40cf6e61806f31d8ed4f1e1 /roles/openshift_logging | |
| parent | bf2f95376ff1eb3a1da9e23cb1c02a1ee90781de (diff) | |
| download | openshift-8b5dd3feeede035ddc0b66ad0b4008a5edba1a07.tar.gz openshift-8b5dd3feeede035ddc0b66ad0b4008a5edba1a07.tar.bz2 openshift-8b5dd3feeede035ddc0b66ad0b4008a5edba1a07.tar.xz openshift-8b5dd3feeede035ddc0b66ad0b4008a5edba1a07.zip | |
Updating logging and metrics to restart api, ha and controllers when updating master config
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/handlers/main.yml | 9 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/oc_apply.yaml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/update_master_config.yaml | 7 |
3 files changed, 16 insertions, 4 deletions
diff --git a/roles/openshift_logging/handlers/main.yml b/roles/openshift_logging/handlers/main.yml index ffb812271..69c5a1663 100644 --- a/roles/openshift_logging/handlers/main.yml +++ b/roles/openshift_logging/handlers/main.yml @@ -4,6 +4,15 @@ when: (openshift.master.ha is not defined or not openshift.master.ha | bool) and (not (master_service_status_changed | default(false) | bool)) notify: Verify API Server +- name: restart master api + systemd: name={{ openshift.common.service_type }}-master-api state=restarted + when: (openshift.master.ha is defined and openshift.master.ha | bool) and (not (master_api_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' + notify: Verify API Server + +- name: restart master controllers + systemd: name={{ openshift.common.service_type }}-master-controllers state=restarted + when: (openshift.master.ha is defined and openshift.master.ha | bool) and (not (master_controllers_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' + - name: Verify API Server # Using curl here since the uri module requires python-httplib2 and # wait_for port doesn't provide health information. diff --git a/roles/openshift_logging/tasks/oc_apply.yaml b/roles/openshift_logging/tasks/oc_apply.yaml index c4db7d033..a0ed56ebd 100644 --- a/roles/openshift_logging/tasks/oc_apply.yaml +++ b/roles/openshift_logging/tasks/oc_apply.yaml @@ -6,7 +6,7 @@ namespace: "{{ namespace }}" files: - "{{ file_name }}" - when: file_content.kind != "Service" + when: file_content.kind not in ["Service", "Route"] ## still need to do this for services until the template logic is replaced by oc_* - block: @@ -49,4 +49,4 @@ failed_when: "'error' in generation_apply.stderr" changed_when: generation_apply.rc == 0 when: "'field is immutable' in generation_apply.stderr" - when: file_content.kind == "Service" + when: file_content.kind in ["Service", "Route"] diff --git a/roles/openshift_logging/tasks/update_master_config.yaml b/roles/openshift_logging/tasks/update_master_config.yaml index cef835668..10f522b61 100644 --- a/roles/openshift_logging/tasks/update_master_config.yaml +++ b/roles/openshift_logging/tasks/update_master_config.yaml @@ -4,6 +4,9 @@ dest: "{{ openshift.common.config_base }}/master/master-config.yaml" yaml_key: assetConfig.loggingPublicURL yaml_value: "https://{{ openshift_logging_kibana_hostname }}" - notify: restart master + notify: + - restart master + - restart master api + - restart master controllers tags: - - update_master_config + - update_master_config |