diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-08 11:27:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-08 11:27:58 -0500 |
| commit | 6c402798d6505a85c786595a3a86395aebb5e8f2 (patch) | |
| tree | 0ab9c39751f295e2cf2028880091a467260307c3 /roles/openshift_metrics | |
| parent | f4a514a769c6a22c8adb3053f92af806d8228abd (diff) | |
| parent | 8b5dd3feeede035ddc0b66ad0b4008a5edba1a07 (diff) | |
| download | openshift-6c402798d6505a85c786595a3a86395aebb5e8f2.tar.gz openshift-6c402798d6505a85c786595a3a86395aebb5e8f2.tar.bz2 openshift-6c402798d6505a85c786595a3a86395aebb5e8f2.tar.xz openshift-6c402798d6505a85c786595a3a86395aebb5e8f2.zip | |
Merge pull request #4026 from ewolinetz/cherry_picks_15
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_metrics')
| -rw-r--r-- | roles/openshift_metrics/handlers/main.yml | 9 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/update_master_config.yaml | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/roles/openshift_metrics/handlers/main.yml b/roles/openshift_metrics/handlers/main.yml index ffb812271..69c5a1663 100644 --- a/roles/openshift_metrics/handlers/main.yml +++ b/roles/openshift_metrics/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_metrics/tasks/update_master_config.yaml b/roles/openshift_metrics/tasks/update_master_config.yaml index 20fc45fd4..be1e3c3a0 100644 --- a/roles/openshift_metrics/tasks/update_master_config.yaml +++ b/roles/openshift_metrics/tasks/update_master_config.yaml @@ -4,6 +4,9 @@ dest: "{{ openshift.common.config_base }}/master/master-config.yaml" yaml_key: assetConfig.metricsPublicURL yaml_value: "https://{{ openshift_metrics_hawkular_hostname}}/hawkular/metrics" - notify: restart master + notify: + - restart master + - restart master api + - restart master controllers tags: - - update_master_config + - update_master_config |